Changeset 9d013fe8 in ffmpeg

Timestamp:

Mar 31, 2014, 8:08:11 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d5c0036d

Parents:

0f714abb (diff), f94371b1 (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> (03/31/14 20:07:34)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/31/14 20:08:11)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: mov: Unbreak sbtl writing

Conflicts:

libavformat/movenc.c

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

(No files)