diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 02:01:10 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 02:01:31 +0200 |
commit | b394b9013ee470b7294c35ad0529f52bc2e4483d (patch) | |
tree | 786abad09307ca729be4a42e693abaaa2f47e6bc /tests/fate/als.mak | |
parent | 6145b1d9c11bb5261e4b5137ef31defacad56eb5 (diff) | |
parent | 58bc38a5f224d29b79338200459792c765c25fd5 (diff) | |
download | ffmpeg-b394b9013ee470b7294c35ad0529f52bc2e4483d.tar.gz |
Merge commit '58bc38a5f224d29b79338200459792c765c25fd5'
* commit '58bc38a5f224d29b79338200459792c765c25fd5':
tiffdec: use correct data type for palette entries and set alpha to 0xFF
Conflicts:
libavcodec/tiff.c
See: dbfdb288c1921eeb9fef5bca20eee33da7fcdd71
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/als.mak')
0 files changed, 0 insertions, 0 deletions