diff options
Diffstat (limited to 'libavcodec/mss1.c')
| -rw-r--r-- | libavcodec/mss1.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/libavcodec/mss1.c b/libavcodec/mss1.c index dffdde5a15..bb1858dbb8 100644 --- a/libavcodec/mss1.c +++ b/libavcodec/mss1.c @@ -2,20 +2,20 @@ * Microsoft Screen 1 (aka Windows Media Video V7 Screen) decoder * Copyright (c) 2012 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 */ @@ -130,7 +130,7 @@ static int decode_pal(MSS12Context *ctx, ArithCoder *acoder) r = arith_get_bits(acoder, 8); g = arith_get_bits(acoder, 8); b = arith_get_bits(acoder, 8); - *pal++ = (r << 16) | (g << 8) | b; + *pal++ = (0xFFU << 24) | (r << 16) | (g << 8) | b; } return !!ncol; @@ -151,10 +151,8 @@ static int mss1_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, init_get_bits(&gb, buf, buf_size * 8); arith_init(&acoder, &gb); - if ((ret = ff_reget_buffer(avctx, &ctx->pic)) < 0) { - av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); + if ((ret = ff_reget_buffer(avctx, &ctx->pic)) < 0) return ret; - } c->pal_pic = ctx->pic.data[0] + ctx->pic.linesize[0] * (avctx->height - 1); c->pal_stride = -ctx->pic.linesize[0]; @@ -193,7 +191,8 @@ static av_cold int mss1_decode_init(AVCodecContext *avctx) int ret; c->ctx.avctx = avctx; - avctx->coded_frame = &c->pic; + + avcodec_get_frame_defaults(&c->pic); ret = ff_mss12_decode_init(&c->ctx, 0, &c->sc, NULL); |