diff options
Diffstat (limited to 'libavcodec/bethsoftvideo.c')
| -rw-r--r-- | libavcodec/bethsoftvideo.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c index c1f95ed889..8eec5b7253 100644 --- a/libavcodec/bethsoftvideo.c +++ b/libavcodec/bethsoftvideo.c @@ -2,20 +2,20 @@ * Bethesda VID video decoder * Copyright (C) 2007 Nicholas Tung * - * 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 */ @@ -40,7 +40,8 @@ typedef struct BethsoftvidContext { static av_cold int bethsoftvid_decode_init(AVCodecContext *avctx) { BethsoftvidContext *vid = avctx->priv_data; - vid->frame.reference = 1; + avcodec_get_frame_defaults(&vid->frame); + vid->frame.reference = 3; vid->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE; avctx->pix_fmt = AV_PIX_FMT_PAL8; @@ -56,7 +57,8 @@ static int set_palette(BethsoftvidContext *ctx) return AVERROR_INVALIDDATA; for(a = 0; a < 256; a++){ - palette[a] = bytestream2_get_be24u(&ctx->g) * 4; + palette[a] = 0xFFU << 24 | bytestream2_get_be24u(&ctx->g) * 4; + palette[a] |= palette[a] >> 6 & 0x30303; } ctx->frame.palette_has_changed = 1; return 0; @@ -75,9 +77,9 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx, int code, ret; int yoffset; - if (avctx->reget_buffer(avctx, &vid->frame)) { + if ((ret = avctx->reget_buffer(avctx, &vid->frame)) < 0) { av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); - return -1; + return ret; } wrap_to_next_line = vid->frame.linesize[0] - avctx->width; @@ -105,7 +107,7 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx, case VIDEO_YOFF_P_FRAME: yoffset = bytestream2_get_le16(&vid->g); if(yoffset >= avctx->height) - return -1; + return AVERROR_INVALIDDATA; dst += vid->frame.linesize[0] * yoffset; } |