Changeset 4cb68141 in ffmpeg

Timestamp:

Mar 9, 2014, 12:41:55 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

9827f3db

Parents:

b39e8950 (diff), 0092c1dd (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 '0092c1dd8dac2d9e185b58503b447a0d3fb5230d'

• commit '0092c1dd8dac2d9e185b58503b447a0d3fb5230d': matroskaenc: allow override of "writing application" tag

Conflicts:

libavformat/matroskaenc.c

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

(No files)