Merge commit '58bc38a5f224d29b79338200459792c765c25fd5'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Apr 2014 00:01:10 +0000 (02:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Apr 2014 00:01:31 +0000 (02:01 +0200)
commitb394b9013ee470b7294c35ad0529f52bc2e4483d
tree786abad09307ca729be4a42e693abaaa2f47e6bc
parent6145b1d9c11bb5261e4b5137ef31defacad56eb5
parent58bc38a5f224d29b79338200459792c765c25fd5
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>