virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

Make the avi palette opaque.

Browse Source
This commit is contained in:
Carl Eugen Hoyos 2011-12-24 03:41:50 +01:00
parent c7062802d9
commit 64cafe340b
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/avidec.c
View File

@ -623,12 +623,8 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
pal_size = FFMIN(pal_size, st->codec->extradata_size); pal_size = FFMIN(pal_size, st->codec->extradata_size);
pal_src = st->codec->extradata + st->codec->extradata_size - pal_size; pal_src = st->codec->extradata + st->codec->extradata_size - pal_size;
#if HAVE_BIGENDIAN
for (i = 0; i < pal_size/4; i++) for (i = 0; i < pal_size/4; i++)
ast->pal[i] = AV_RL32(pal_src+4*i); ast->pal[i] = 0xFF<<24 | AV_RL32(pal_src+4*i);
#else
memcpy(ast->pal, pal_src, pal_size);
#endif
ast->has_pal = 1; ast->has_pal = 1;
} }
@ -971,7 +967,7 @@ start_sync:
avio_rl16(pb); //flags avio_rl16(pb); //flags
for (; k <= last; k++) for (; k <= last; k++)
ast->pal[k] = avio_rb32(pb)>>8;// b + (g << 8) + (r << 16); ast->pal[k] = 0xFF<<24 | avio_rb32(pb)>>8;// b + (g << 8) + (r << 16);
ast->has_pal= 1; ast->has_pal= 1;
goto start_sync; goto start_sync;
} else if( ((ast->prefix_count<5 || sync+9 > i) && d[2]<128 && d[3]<128) || } else if( ((ast->prefix_count<5 || sync+9 > i) && d[2]<128 && d[3]<128) ||