Changeset 1b1d77ae in ffmpeg

Timestamp:

Mar 9, 2014, 9:48:08 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

cb403b25

Parents:

ce1ad8d7 (diff), 20b40a59 (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.

Message:

Merge commit '20b40a597cdd4969cf1147d7c7efee2b6232524b'

• commit '20b40a597cdd4969cf1147d7c7efee2b6232524b': movenc: write hvcC tag for HEVC.

Conflicts:

libavformat/Makefile

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

(No files)