Changeset 9e1d97aa in ffmpeg

Timestamp:

Jun 6, 2014, 9:09:26 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

00acf5c4

Parents:

58e501b1 (diff), efc2dfe6 (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> (06/06/14 21:09:22)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/06/14 21:09:26)

Message:

Merge commit 'efc2dfe6a0238ec08769626db899ea910be24407'

• commit 'efc2dfe6a0238ec08769626db899ea910be24407': avcodec options: add enum option for color_trc

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

(No files)