diff options
Diffstat (limited to 'libavcodec/wnv1.c')
| -rw-r--r-- | libavcodec/wnv1.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c index 7676c89..fb9e9cf 100644 --- a/libavcodec/wnv1.c +++ b/libavcodec/wnv1.c @@ -2,20 +2,20 @@ * Winnov WNV1 codec * Copyright (c) 2005 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 */ @@ -31,8 +31,6 @@ typedef struct WNV1Context { - AVCodecContext *avctx; - int shift; GetBitContext gb; } WNV1Context; @@ -70,8 +68,8 @@ static int decode_frame(AVCodecContext *avctx, int prev_y = 0, prev_u = 0, prev_v = 0; uint8_t *rbuf; - if (buf_size < 8) { - av_log(avctx, AV_LOG_ERROR, "Packet is too short\n"); + if (buf_size <= 8) { + av_log(avctx, AV_LOG_ERROR, "Packet size %d is too small\n", buf_size); return AVERROR_INVALIDDATA; } @@ -80,9 +78,9 @@ static int decode_frame(AVCodecContext *avctx, av_log(avctx, AV_LOG_ERROR, "Cannot allocate temporary buffer\n"); return AVERROR(ENOMEM); } + memset(rbuf + buf_size, 0, FF_INPUT_BUFFER_PADDING_SIZE); if ((ret = ff_get_buffer(avctx, p, 0)) < 0) { - av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_free(rbuf); return ret; } @@ -90,7 +88,9 @@ static int decode_frame(AVCodecContext *avctx, for (i = 8; i < buf_size; i++) rbuf[i] = ff_reverse[buf[i]]; - init_get_bits(&l->gb, rbuf + 8, (buf_size - 8) * 8); + + if ((ret = init_get_bits8(&l->gb, rbuf + 8, buf_size - 8)) < 0) + return ret; if (buf[2] >> 4 == 6) l->shift = 2; @@ -134,10 +134,8 @@ static int decode_frame(AVCodecContext *avctx, static av_cold int decode_init(AVCodecContext *avctx) { - WNV1Context * const l = avctx->priv_data; static VLC_TYPE code_table[1 << CODE_VLC_BITS][2]; - l->avctx = avctx; avctx->pix_fmt = AV_PIX_FMT_YUV422P; code_vlc.table = code_table; |
