Changeset 1c79ca27 in ffmpeg

Timestamp:

Mar 17, 2014, 2:55:18 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

ca0e6fa7

Parents:

ba7cdb97 (diff), 5b1b91cf (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> (03/17/14 14:54:48)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/17/14 14:55:18)

Message:

Merge commit '5b1b91cfb82d56c09846c68b09d2b8b7c8faccc4'

• commit '5b1b91cfb82d56c09846c68b09d2b8b7c8faccc4': tiff: Support rgba encoding

Conflicts:

libavcodec/tiffenc.c

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

(No files)