Changeset dff4aa6a in ffmpeg

Timestamp:

May 28, 2014, 11:08:50 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

61917a10

Parents:

579e2b28 (diff), efcde91 (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 'efcde917af407a6031ecff68edd51fce7b83d104'

• commit 'efcde917af407a6031ecff68edd51fce7b83d104': vorbiscomment: simplify API by using av_dict_count()

Conflicts:

libavformat/flacenc.c

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

(No files)