[FFmpeg-cvslog] Merge commit '58bc38a5f224d29b79338200459792c765c25fd5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 13 02:01:10 2014 +0200| [b394b9013ee470b7294c35ad0529f52bc2e4483d] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b394b9013ee470b7294c35ad0529f52bc2e4483d
---