* commit '8a2250344b19a343d830a902dbcf4c0b929ea49b': jv: detect partial packets in the demuxer Conflicts: libavformat/jvdec.c See: 9d0c71e5e3 See: b948ab8132 Merged-by: Michael Niedermayer <michaelni@gmx.at>
9d0c71e5e3
b948ab8132
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Paul B Mahol <onemda@gmail.com>