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

Merge commit 'd0dce15da34c0e4eee6c683be299de0221db00d3'

Browse Source 
* commit 'd0dce15da34c0e4eee6c683be299de0221db00d3':
  quickdraw: Make the palette opaque

Conflicts:
	libavcodec/qdrw.c

See: 9f9a1f424ed4db992f8a773b2eaad4941de3e9e6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-05-13 20:38:15 +02:00
commit 5d9873ecda
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/qdrw.c
View File

@ -61,7 +61,7 @@ static int parse_palette(AVCodecContext *avctx, GetByteContext *gbc,
bytestream2_skip(gbc, 1); bytestream2_skip(gbc, 1);
b = bytestream2_get_byte(gbc); b = bytestream2_get_byte(gbc);
bytestream2_skip(gbc, 1); bytestream2_skip(gbc, 1);
pal[idx] = 0xFFU << 24 | r << 16 | g << 8 | b; pal[idx] = (0xFFU << 24) | (r << 16) | (g << 8) | b;
} }
return 0; return 0;
} }