Changeset ef1aae6e in ffmpeg

Timestamp:

Feb 19, 2014, 1:19:45 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3f461566

Parents:

53d11f7b (diff), 1e142d5b (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 '1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66'

• commit '1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66': movenc: Add a fallback fragmentation method for plain mp4 as well

Conflicts:

libavformat/movenc.c

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

(No files)