diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-19 04:02:11 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-01-19 14:27:56 +0100 |
| commit | 756cd1a305d23f9817f87c583b8d9ded28704893 (patch) | |
| tree | 8030e839b56200ff06e657d5f3c1ca270e26be62 | |
| parent | 83dc8f044d66379166fce96d604c8be7640cbbcd (diff) | |
| download | ffmpeg-756cd1a305d23f9817f87c583b8d9ded28704893.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>
(cherry picked from commit 31e703e899bee74c50efd8eb62c3d012ef5ab26d)
| -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 b168bd9320..1de773263c 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1799,7 +1799,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", |