diff options
Diffstat (limited to 'libavcodec/rl2.c')
| -rw-r--r-- | libavcodec/rl2.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/libavcodec/rl2.c b/libavcodec/rl2.c index 4f68f7e997..c8853de22e 100644 --- a/libavcodec/rl2.c +++ b/libavcodec/rl2.c @@ -2,20 +2,20 @@ * RL2 Video Decoder * Copyright (C) 2008 Sascha Sommer (saschasommer@freenet.de) * - * 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 */ @@ -53,7 +53,7 @@ typedef struct Rl2Context { * @param s rl2 context * @param in input buffer * @param size input buffer size - * @param out ouput buffer + * @param out output buffer * @param stride stride of the output buffer * @param video_base offset of the rle data inside the frame */ @@ -155,7 +155,7 @@ static av_cold int rl2_decode_init(AVCodecContext *avctx) /** initialize palette */ for (i = 0; i < AVPALETTE_COUNT; i++) - s->palette[i] = AV_RB24(&avctx->extradata[6 + i * 3]); + s->palette[i] = 0xFFU << 24 | AV_RB24(&avctx->extradata[6 + i * 3]); /** decode background frame if present */ back_size = avctx->extradata_size - EXTRADATA1_SIZE; @@ -181,10 +181,8 @@ static int rl2_decode_frame(AVCodecContext *avctx, int ret, buf_size = avpkt->size; Rl2Context *s = avctx->priv_data; - if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) { - av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret; - } /** run length decode */ rl2_rle_decode(s, buf, buf_size, frame->data[0], frame->linesize[0], |