Changeset e1f4397e in ffmpeg

Timestamp:

Jul 11, 2014, 10:21:41 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

4c915994

Parents:

aa56c37c (diff), 458e7c94 (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/11/14 10:18:52)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (07/11/14 10:21:41)

Message:

Merge commit '458e7c94830d1522997e33a0b5e87bd709e8a349'

• commit '458e7c94830d1522997e33a0b5e87bd709e8a349': hevc: implement pic_output_flag handling

Conflicts:

libavcodec/hevc.c
libavcodec/hevc_refs.c

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

(No files)