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:43:47 +0100 |
| commit | f0fabcc6ed0d6e1db9630ce975afeec2bfa3ede7 (patch) | |
| tree | dfa6876592c5a22813abeccd39cb6718251a961c | |
| parent | bd29764c6177f8bb07f70799a5de40df52cfde28 (diff) | |
| download | ffmpeg-f0fabcc6ed0d6e1db9630ce975afeec2bfa3ede7.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)
Conflicts:
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 eaf2659e63..97e0f12f44 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1659,7 +1659,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 > (1U<<28)) { av_log(avctx, AV_LOG_ERROR, "MJPEG packet 0x%x too big (0x%x/0x%x), corrupt data?\n", start_code, unescaped_buf_size, buf_size); |