Changeset 01a5d717 in ffmpeg

Timestamp:

Apr 6, 2014, 9:57:42 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

5dae3cf3

Parents:

9e7f1474 (diff), 3d5c859f (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> (04/06/14 21:57:37)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/06/14 21:57:42)

Message:

Merge remote-tracking branch 'cehoyos/master'

• cehoyos/master: Set Matroska private data when muxing Prores.

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

(No files)