diff options
Diffstat (limited to 'libavcodec/rv34.c')
| -rw-r--r-- | libavcodec/rv34.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index ffc8649f12..4226ecb1f8 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -2,20 +2,20 @@ * RV30/40 decoder common data * Copyright (c) 2007 Mike Melanson, Konstantin Shishkov * - * 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 */ @@ -1332,7 +1332,7 @@ static int check_slice_end(RV34DecContext *r, MpegEncContext *s) if(r->s.mb_skip_run > 1) return 0; bits = get_bits_left(&s->gb); - if(bits < 0 || (bits < 8 && !show_bits(&s->gb, bits))) + if(bits <= 0 || (bits < 8 && !show_bits(&s->gb, bits))) return 1; return 0; } @@ -1403,6 +1403,10 @@ static int rv34_decode_slice(RV34DecContext *r, int end, const uint8_t* buf, int av_log(s->avctx, AV_LOG_ERROR, "Slice type mismatch\n"); return AVERROR_INVALIDDATA; } + if (s->width != r->si.width || s->height != r->si.height) { + av_log(s->avctx, AV_LOG_ERROR, "Size mismatch\n"); + return AVERROR_INVALIDDATA; + } r->si.end = end; s->qscale = r->si.quant; @@ -1645,7 +1649,7 @@ int ff_rv34_decode_frame(AVCodecContext *avctx, /* first slice */ if (si.start == 0) { if (s->mb_num_left > 0) { - av_log(avctx, AV_LOG_ERROR, "New frame but still %d MB left.", + av_log(avctx, AV_LOG_ERROR, "New frame but still %d MB left.\n", s->mb_num_left); ff_er_frame_end(s); ff_MPV_frame_end(s); |