diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-19 04:56:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-19 04:57:03 +0100 |
| commit | 361e27a3d8096baacc45d2551a1ebfcbfdaa6a67 (patch) | |
| tree | ce7c5a09721d4220801ab2dcef0f2cd41d4a2ece /libavcodec/mjpegdec.c | |
| parent | 8893f31e206358d933abe4a5227b5ae89f5f303d (diff) | |
| download | ffmpeg-361e27a3d8096baacc45d2551a1ebfcbfdaa6a67.tar.gz | |
avcodec/mjpegdec: only run EOI emulation code when there was a scan
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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 ab4d2bab34..df62ebc74a 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1951,7 +1951,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; } |