diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-19 04:56:13 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-01-19 14:27:48 +0100 |
| commit | 83dc8f044d66379166fce96d604c8be7640cbbcd (patch) | |
| tree | acb164dbe0ac7c55ef0868052957347e2f382a7b /libavcodec/mjpegdec.c | |
| parent | 2c5c6affb1c32855f1452c914d35bc899f391c1f (diff) | |
| download | android_external_ffmpeg-83dc8f044d66379166fce96d604c8be7640cbbcd.tar.gz android_external_ffmpeg-83dc8f044d66379166fce96d604c8be7640cbbcd.tar.bz2 android_external_ffmpeg-83dc8f044d66379166fce96d604c8be7640cbbcd.zip | |
avcodec/mjpegdec: only run EOI emulation code when there was a scan
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 361e27a3d8096baacc45d2551a1ebfcbfdaa6a67)
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 361f2992c1..b168bd9320 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1953,7 +1953,7 @@ eoi_parser: "marker parser used %d bytes (%d bits)\n", (get_bits_count(&s->gb) + 7) / 8, get_bits_count(&s->gb)); } - if (s->got_picture) { + if (s->got_picture && s->cur_scan) { av_log(avctx, AV_LOG_WARNING, "EOI missing, emulating\n"); goto eoi_parser; } |