Changeset efc66d69 in ffmpeg

Timestamp:

Jul 9, 2014, 10:19:43 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

92c29914

Parents:

cd0dc887 (diff), 0569a7e0 (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> (07/09/14 22:15:34)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (07/09/14 22:19:43)

Message:

Merge commit '0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50'

• commit '0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50': hevc: parse display orientation SEI message

Conflicts:

libavcodec/hevc.h
libavcodec/hevc_sei.c

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

(No files)