diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-19 16:44:58 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-01-20 22:26:00 +0100 |
| commit | 30a94f1159d4715b1fae906925dd6e852269a2ac (patch) | |
| tree | 438b1e8f7f25705f36bba8086f2061e80b9d8f08 /libavcodec/mjpegdec.c | |
| parent | 9d83cff1f117168899bdc97c32c8cb5244db7676 (diff) | |
| download | android_external_ffmpeg-30a94f1159d4715b1fae906925dd6e852269a2ac.tar.gz android_external_ffmpeg-30a94f1159d4715b1fae906925dd6e852269a2ac.tar.bz2 android_external_ffmpeg-30a94f1159d4715b1fae906925dd6e852269a2ac.zip | |
avcodec/mjpegdec: Dont skip picture allocation if theres no picture allocated
Fixes Ticket 3245
(cherry picked from commit ad8d063f230c05f8b5efbd05cc5a9f51a2549dcf)
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 1de773263c..c434de9dbe 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -334,7 +334,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) s->first_picture = 0; } - if (s->interlaced && (s->bottom_field == !s->interlace_polarity)) { + if (s->got_picture && s->interlaced && (s->bottom_field == !s->interlace_polarity)) { if (s->progressive) { avpriv_request_sample(s->avctx, "progressively coded interlaced picture"); return AVERROR_INVALIDDATA; |