diff options
Diffstat (limited to 'libavcodec/c93.c')
| -rw-r--r-- | libavcodec/c93.c | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/libavcodec/c93.c b/libavcodec/c93.c index 2729ee8fcb..eff8887c27 100644 --- a/libavcodec/c93.c +++ b/libavcodec/c93.c @@ -2,20 +2,20 @@ * Interplay C93 video decoder * Copyright (c) 2007 Anssi Hannula <anssi.hannula@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 */ @@ -133,12 +133,13 @@ static int decode_frame(AVCodecContext *avctx, void *data, uint8_t *out; int stride, ret, i, x, y, b, bt = 0; + if ((ret = ff_set_dimensions(avctx, WIDTH, HEIGHT)) < 0) + return ret; + c93->currentpic ^= 1; - if ((ret = ff_reget_buffer(avctx, newpic)) < 0) { - av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); + if ((ret = ff_reget_buffer(avctx, newpic)) < 0) return ret; - } stride = newpic->linesize[0]; @@ -176,7 +177,14 @@ static int decode_frame(AVCodecContext *avctx, void *data, case C93_4X4_FROM_PREV: for (j = 0; j < 8; j += 4) { for (i = 0; i < 8; i += 4) { - offset = bytestream2_get_le16(&gb); + int offset = bytestream2_get_le16(&gb); + int from_x = offset % WIDTH; + int from_y = offset / WIDTH; + if (block_type == C93_4X4_FROM_CURR && from_y == y+j && + (FFABS(from_x - x-i) < 4 || FFABS(from_x - x-i) > WIDTH-4)) { + avpriv_request_sample(avctx, "block overlap %d %d %d %d\n", from_x, x+i, from_y, y+j); + return AVERROR_INVALIDDATA; + } if ((ret = copy_block(avctx, &out[j*stride+i], copy_from, offset, 4, stride)) < 0) return ret; @@ -236,7 +244,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, if (b & C93_HAS_PALETTE) { uint32_t *palette = (uint32_t *) newpic->data[1]; for (i = 0; i < 256; i++) { - palette[i] = bytestream2_get_be24(&gb); + palette[i] = 0xFFU << 24 | bytestream2_get_be24(&gb); } newpic->palette_has_changed = 1; } else { |