Changeset 3b8299c1 in ffmpeg

Timestamp:

Jan 10, 2014, 1:32:12 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

402a4114

Parents:

4162ceea (diff), aa69cbc9 (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 'aa69cbc9e08281db6ecb98a2c8b4f60e8b12e558'

• commit 'aa69cbc9e08281db6ecb98a2c8b4f60e8b12e558': flac muxer: add option to disable writing the global header

Conflicts:

libavformat/version.h

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

(No files)