aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-07-04 18:22:33 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-07-04 18:22:33 +0000
commit1496b04c28ba9ef291bef1936641bff364484075 (patch)
tree6e930897738a5c22b801f5426b38e3787d11f47a
parent643fd8a198ddb67225f5edd503f8f151d13635a3 (diff)
downloadffmpeg-1496b04c28ba9ef291bef1936641bff364484075.tar.gz
Make the MJPEG decoder return -1 when no image was decoded so that decode
errors are actually recognizable as such. Originally committed as revision 19343 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/mjpegdec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index b5f8281cc1..a40dfdbef5 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1479,6 +1479,8 @@ not_the_end:
}
}
}
+ av_log(avctx, AV_LOG_FATAL, "No JPEG data found in image\n");
+ return -1;
the_end:
av_log(avctx, AV_LOG_DEBUG, "mjpeg decode frame unused %td bytes\n", buf_end - buf_ptr);
// return buf_end - buf_ptr;