Changeset b394b901 in ffmpeg

Timestamp:

Apr 13, 2014, 12:01:31 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d06a7530

Parents:

6145b1d9 (diff), 58bc38a5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (04/13/14 00:01:10)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/13/14 00:01:31)

Message:

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>

(No files)