diff options
| author | Clément Bœsch <cboesch@gopro.com> | 2017-04-07 17:50:44 +0200 |
|---|---|---|
| committer | Clément Bœsch <cboesch@gopro.com> | 2017-04-07 18:05:20 +0200 |
| commit | 8d94d9798a6903fc65ceb8e5af843cb6a793e045 (patch) | |
| tree | 9fa7b9d4294a3f9ffa976f923422c2f7105ff348 /libavcodec/mjpegdec.c | |
| parent | 7c1566fec39492815eda0dc1fdfd18f8bf7ca635 (diff) | |
| download | ffmpeg-8d94d9798a6903fc65ceb8e5af843cb6a793e045.tar.gz | |
lavc/mjpegdec: allow failure while decoding APP
Fix decoding frame.jpg from ticket #267
Regression since 9c7ee3749 / 212c6a1d7
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |