diff options
Diffstat (limited to 'libavcodec/mjpegbdec.c')
| -rw-r--r-- | libavcodec/mjpegbdec.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/libavcodec/mjpegbdec.c b/libavcodec/mjpegbdec.c index a5f32a694a..f061f0bc26 100644 --- a/libavcodec/mjpegbdec.c +++ b/libavcodec/mjpegbdec.c @@ -2,20 +2,20 @@ * Apple MJPEG-B decoder * Copyright (c) 2002 Alex Beregszaszi * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -52,6 +52,7 @@ static int mjpegb_decode_frame(AVCodecContext *avctx, buf_ptr = buf; buf_end = buf + buf_size; + s->got_picture = 0; read_header: /* reset on every SOI */ @@ -129,13 +130,17 @@ read_header: if (s->bottom_field != s->interlace_polarity && second_field_offs) { buf_ptr = buf + second_field_offs; - second_field_offs = 0; goto read_header; } } //XXX FIXME factorize, this looks very similar to the EOI code + if(!s->got_picture) { + av_log(avctx, AV_LOG_WARNING, "no picture\n"); + return buf_size; + } + if ((ret = av_frame_ref(data, s->picture_ptr)) < 0) return ret; *got_frame = 1; @@ -158,4 +163,5 @@ AVCodec ff_mjpegb_decoder = { .close = ff_mjpeg_decode_end, .decode = mjpegb_decode_frame, .capabilities = CODEC_CAP_DR1, + .max_lowres = 3, }; |