generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/avidec: ensure that palette does not contain the BottomUp info.

Browse Source 
Considering the palette is located at the end of extradata may be flawed
when the extradata contains the palette followed by the BottomUp field.
When the BottomUp field is present, exclude it from the palette.
Fixes part of ticket #1304

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Benoit Fouet 2014-09-22 09:57:37 +02:00 committed by Michael Niedermayer
parent 591e06b0e2
commit 9c843fb1d0
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/avidec.c
View File

@ -756,6 +756,10 @@ static int avi_read_header(AVFormatContext *s)
pal_size = FFMIN(pal_size, st->codec->extradata_size); pal_size = FFMIN(pal_size, st->codec->extradata_size);
pal_src = st->codec->extradata + pal_src = st->codec->extradata +
st->codec->extradata_size - pal_size; st->codec->extradata_size - pal_size;
/* Exclude the "BottomUp" field from the palette */
if (pal_src - st->codec->extradata >= 9 &&
!memcmp(st->codec->extradata + st->codec->extradata_size - 9, "BottomUp", 9))
pal_src -= 9;
for (i = 0; i < pal_size / 4; i++) for (i = 0; i < pal_size / 4; i++)
ast->pal[i] = 0xFFU<<24 | AV_RL32(pal_src+4*i); ast->pal[i] = 0xFFU<<24 | AV_RL32(pal_src+4*i);
ast->has_pal = 1; ast->has_pal = 1;