diff options
Diffstat (limited to 'libavcodec/escape130.c')
| -rw-r--r-- | libavcodec/escape130.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/libavcodec/escape130.c b/libavcodec/escape130.c index bc865a3b21..466b2b51df 100644 --- a/libavcodec/escape130.c +++ b/libavcodec/escape130.c @@ -2,20 +2,20 @@ * Escape 130 video decoder * Copyright (C) 2008 Eli Friedman (eli.friedman <at> gmail.com) * - * 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 */ @@ -105,7 +105,7 @@ static const int8_t chroma_adjust[2][8] = { { 0, 1, 1, 1, 0, -1, -1, -1 } }; -const uint8_t chroma_vals[] = { +static const uint8_t chroma_vals[] = { 20, 28, 36, 44, 52, 60, 68, 76, 84, 92, 100, 106, 112, 116, 120, 124, 128, 132, 136, 140, 144, 150, 156, 164, @@ -166,6 +166,9 @@ static int decode_skip_count(GetBitContext* gb) { int value; + if (get_bits_left(gb) < 1+3) + return -1; + value = get_bits1(gb); if (value) return 0; @@ -188,7 +191,6 @@ static int decode_skip_count(GetBitContext* gb) static int escape130_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { - const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; Escape130Context *s = avctx->priv_data; AVFrame *pic = data; @@ -215,7 +217,9 @@ static int escape130_decode_frame(AVCodecContext *avctx, void *data, if ((ret = ff_get_buffer(avctx, pic, 0)) < 0) return ret; - init_get_bits(&gb, buf + 16, (buf_size - 16) * 8); + if ((ret = init_get_bits8(&gb, avpkt->data, avpkt->size)) < 0) + return ret; + skip_bits_long(&gb, 16 * 8); new_y = s->new_y; new_cb = s->new_u; |