har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the MJPEG decoder return -1 when no image was decoded so that decode

Browse Source 
errors are actually recognizable as such.

Originally committed as revision 19343 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2009-07-04 18:22:33 +00:00
parent 643fd8a198
commit 1496b04c28
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/mjpegdec.c
View File

@ -1479,6 +1479,8 @@ not_the_end:
} }
} }
} }
av_log(avctx, AV_LOG_FATAL, "No JPEG data found in image\n");
return -1;
the_end: the_end:
av_log(avctx, AV_LOG_DEBUG, "mjpeg decode frame unused %td bytes\n", buf_end - buf_ptr); av_log(avctx, AV_LOG_DEBUG, "mjpeg decode frame unused %td bytes\n", buf_end - buf_ptr);
// return buf_end - buf_ptr; // return buf_end - buf_ptr;