mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-24 13:56:33 +02:00
lavc/mjpegdec: allow failure while decoding APP
Fix decoding frame.jpg from ticket #267 Regression since 9c7ee3749 / 212c6a1d7
This commit is contained in:
parent
7c1566fec3
commit
8d94d9798a
@ -2144,7 +2144,8 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
|
||||
/* APP fields */
|
||||
} else if (start_code >= APP0 && start_code <= APP15) {
|
||||
if ((ret = mjpeg_decode_app(s)) < 0)
|
||||
return ret;
|
||||
av_log(avctx, AV_LOG_ERROR, "unable to decode APP fields: %s\n",
|
||||
av_err2str(ret));
|
||||
/* Comment */
|
||||
} else if (start_code == COM) {
|
||||
ret = mjpeg_decode_com(s);
|
||||
|
Loading…
x
Reference in New Issue
Block a user