Changeset 955b31a7 in ffmpeg

Timestamp:

Jun 1, 2014, 12:16:29 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d0979357

Parents:

855e3b57 (diff), e19d48df (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 'e19d48dfce52f1417f7f06143b96fed00cbcdc52'

• commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52': flac muxer: support reading updated extradata from side data

Conflicts:

libavformat/flacenc.c

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

(No files)