[FFmpeg-cvslog] avcodec/mjpegdec: Dont treat the lack of a startcode differently from end of the bitstream
Michael Niedermayer
git at videolan.org
Sun Jan 19 05:04:41 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 19 04:02:11 2014 +0100| [31e703e899bee74c50efd8eb62c3d012ef5ab26d] | committer: Michael Niedermayer
avcodec/mjpegdec: Dont treat the lack of a startcode differently from end of the bitstream
Fixes Ticket3303
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=31e703e899bee74c50efd8eb62c3d012ef5ab26d
---
libavcodec/mjpegdec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index df62ebc..5eebec4 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",
More information about the ffmpeg-cvslog
mailing list