Commit 8d94d979 authored by Clément Bœsch's avatar Clément Bœsch

lavc/mjpegdec: allow failure while decoding APP

Fix decoding frame.jpg from ticket #267

Regression since 9c7ee374 / 212c6a1d
parent 7c1566fe
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment