Changeset 1c0ce2d4 in ffmpeg

Timestamp:

May 28, 2014, 10:49:28 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

579e2b28

Parents:

69de229b (diff), 4efdadc8 (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 '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0'

• commit '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0': matroskadec: export just the STREAMINFO block as FLAC extradata

Conflicts:

libavformat/matroskadec.c

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

(No files)