Changeset a76390d1 in ffmpeg

Timestamp:

Aug 21, 2013, 9:00:26 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

58e12732

Parents:

8d63aaed (diff), 6c78676 (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> (08/21/13 08:59:02)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (08/21/13 09:00:26)

Message:

Merge commit '6c786765cd5eb794dedd4a0970dfe689b16dfeeb'

• commit '6c786765cd5eb794dedd4a0970dfe689b16dfeeb': movenc: Allow chapters to be written in trailer

Conflicts:

libavformat/movenc.c

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

(No files)