Changeset be41f21 in ffmpeg

Timestamp:

Nov 4, 2013, 8:26:34 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b906d048

Parents:

b84cd22a (diff), cd8f772 (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> (11/04/13 20:25:36)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/04/13 20:26:34)

Message:

Merge commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212'

• commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212': lavc: Add colorimetry values for BT.2020, other non-included ones

Conflicts:

doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h

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

(No files)