Changeset 1d8e97c7 in ffmpeg

Timestamp:

Mar 19, 2014, 12:32:05 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a2339ef7

Parents:

543a46e0 (diff), 8f45bd14 (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/19/14 00:29:44)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/19/14 00:32:05)

Message:

Merge commit '8f45bd1433a1d8534d7b3997219c4ca31a669042'

• commit '8f45bd1433a1d8534d7b3997219c4ca31a669042': libopenjpeg: Support rgba64 encoding

Conflicts:

libavcodec/libopenjpegenc.c

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

(No files)