From b98a8419ccabdde5a844ce1da8689bc66c6f8767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Fri, 7 Apr 2017 17:50:44 +0200 Subject: [PATCH] lavc/mjpegdec: allow failure while decoding APP Fix decoding frame.jpg from ticket #267 Regression since 9c7ee3749 / 212c6a1d7 --- libavcodec/mjpegdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index cef3b380be..98cbd416e2 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -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); -- 2.12.2