-
Michael Niedermayer authored
* commit '8a225034': jv: detect partial packets in the demuxer Conflicts: libavformat/jvdec.c See: 9d0c71e5 See: b948ab81Merged-by: Michael Niedermayer <michaelni@gmx.at>
abb6821e
* commit '8a225034': jv: detect partial packets in the demuxer Conflicts: libavformat/jvdec.c See: 9d0c71e5 See: b948ab81Merged-by: Michael Niedermayer <michaelni@gmx.at>