Changeset c7e54628 in ffmpeg

Timestamp:

Jun 4, 2014, 10:54:15 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

11b47038

Parents:

a40c338a (diff), 95b7fa17 (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 '95b7fa1729b93bbb3f4fb85a5c0cb53cf970c3c7'

• commit '95b7fa1729b93bbb3f4fb85a5c0cb53cf970c3c7': oggenc: Support flushing the muxer

Conflicts:

libavformat/version.h

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

(No files)