diff options
Diffstat (limited to 'libavcodec/yop.c')
| -rw-r--r-- | libavcodec/yop.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libavcodec/yop.c b/libavcodec/yop.c index a16a5eb6f7..05abb24553 100644 --- a/libavcodec/yop.c +++ b/libavcodec/yop.c @@ -5,20 +5,20 @@ * derived from the code by * Copyright (C) 2009 Thomas P. Higdon <thomas.p.higdon@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 */ @@ -91,6 +91,7 @@ static av_cold int yop_decode_init(AVCodecContext *avctx) avctx->pix_fmt = PIX_FMT_PAL8; + avcodec_get_frame_defaults(&s->frame); s->num_pal_colors = avctx->extradata[0]; s->first_color[0] = avctx->extradata[1]; s->first_color[1] = avctx->extradata[2]; @@ -216,10 +217,13 @@ static int yop_decode_frame(AVCodecContext *avctx, void *data, int *data_size, firstcolor = s->first_color[is_odd_frame]; palette = (uint32_t *)s->frame.data[1]; - for (i = 0; i < s->num_pal_colors; i++, s->srcptr += 3) + for (i = 0; i < s->num_pal_colors; i++, s->srcptr += 3) { palette[i + firstcolor] = (s->srcptr[0] << 18) | (s->srcptr[1] << 10) | (s->srcptr[2] << 2); + palette[i + firstcolor] |= 0xFF << 24 | + (palette[i + firstcolor] >> 6) & 0x30303; + } s->frame.palette_has_changed = 1; |