Changeset 46405813 in ffmpeg

Timestamp:

Sep 10, 2013, 8:20:11 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

5cfa519

Parents:

ada9b17e (diff), bdf99042 (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 remote-tracking branch 'qatar/master'

• qatar/master: movenc: Simplify setting the fragmentation flag

Conflicts:

libavformat/movenc.c

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

(No files)