highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msrle: fix extradata palette handling

Browse Source 
Fixes Ticket1273

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-08-06 19:34:09 +02:00
parent d74ade7d5f
commit 21eafa18e6
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/msrle.c
View File

@ -50,6 +50,7 @@ typedef struct MsrleContext {
static av_cold int msrle_decode_init(AVCodecContext *avctx) static av_cold int msrle_decode_init(AVCodecContext *avctx)
{ {
MsrleContext *s = avctx->priv_data; MsrleContext *s = avctx->priv_data;
int i;
s->avctx = avctx; s->avctx = avctx;
@ -72,6 +73,10 @@ static av_cold int msrle_decode_init(AVCodecContext *avctx)
avcodec_get_frame_defaults(&s->frame); avcodec_get_frame_defaults(&s->frame);
s->frame.data[0] = NULL; s->frame.data[0] = NULL;
if (avctx->extradata_size >= AVPALETTE_SIZE)
for (i = 0; i < AVPALETTE_SIZE/4; i++)
s->pal[i] = 0xFF<<24 | AV_RL32(avctx->extradata+4*i);
return 0; return 0;
} }
@ -101,11 +106,11 @@ static int msrle_decode_frame(AVCodecContext *avctx,
s->frame.palette_has_changed = 1; s->frame.palette_has_changed = 1;
memcpy(s->pal, pal, AVPALETTE_SIZE); memcpy(s->pal, pal, AVPALETTE_SIZE);
} }
/* make the palette available */
memcpy(s->frame.data[1], s->pal, AVPALETTE_SIZE);
} }
/* make the palette available */
memcpy(s->frame.data[1], s->pal, AVPALETTE_SIZE);
/* FIXME how to correctly detect RLE ??? */ /* FIXME how to correctly detect RLE ??? */
if (avctx->height * istride == avpkt->size) { /* assume uncompressed */ if (avctx->height * istride == avpkt->size) { /* assume uncompressed */
int linesize = (avctx->width * avctx->bits_per_coded_sample + 7) / 8; int linesize = (avctx->width * avctx->bits_per_coded_sample + 7) / 8;