generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/mjpegdec: only run EOI emulation code when there was a scan

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 361e27a3d8)
This commit is contained in:
Michael Niedermayer
2014-01-19 04:56:13 +01:00
committed by Carl Eugen Hoyos
parent 3ae81880e1
commit 55a4228ac2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/mjpegdec.c
View File

@@ -1811,7 +1811,7 @@ eoi_parser:
(get_bits_count(&s->gb) + 7) / 8, get_bits_count(&s->gb)); (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"); av_log(avctx, AV_LOG_WARNING, "EOI missing, emulating\n");
goto eoi_parser; goto eoi_parser;
} }