diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-19 04:02:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-19 05:03:16 +0100 |
| commit | 31e703e899bee74c50efd8eb62c3d012ef5ab26d (patch) | |
| tree | aef85682f52c085f7fd8cbf410aa9be9a59402c8 /libavcodec/mjpegdec.c | |
| parent | 361e27a3d8096baacc45d2551a1ebfcbfdaa6a67 (diff) | |
| download | ffmpeg-31e703e899bee74c50efd8eb62c3d012ef5ab26d.tar.gz | |
avcodec/mjpegdec: Dont treat the lack of a startcode differently from end of the bitstream
Fixes Ticket3303
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 df62ebc74a..5eebec423b 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1797,7 +1797,7 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, &unescaped_buf_size); /* EOF */ if (start_code < 0) { - goto the_end; + break; } else if (unescaped_buf_size > INT_MAX / 8) { av_log(avctx, AV_LOG_ERROR, "MJPEG packet 0x%x too big (%d/%d), corrupt data?\n", |