Changeset e222cfef in ffmpeg

Timestamp:

May 27, 2014, 12:27:35 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

6e9dbee

Parents:

e6a08464 (diff), 4d8c28d (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> (05/27/14 00:26:45)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/27/14 00:27:35)

Message:

Merge commit '4d8c28deab2488579f585406110b1be790896e59'

• commit '4d8c28deab2488579f585406110b1be790896e59': imgutils: make systematic palette opaque.

Conflicts:

libavutil/imgutils.c

See: 4d8c28deab2488579f585406110b1be790896e59
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)