Merge commit 'efcde917af407a6031ecff68edd51fce7b83d104'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 11:08:50 +0000 (13:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 11:08:50 +0000 (13:08 +0200)
commitdff4aa6afd40bcc6c71b5a21d229fb941f9fc1eb
treee50cc5c08974c011ff14516a14d602605eee065a
parent579e2b2874aeaa9cfdeed1fd1408767e33a63029
parentefcde917af407a6031ecff68edd51fce7b83d104
Merge commit 'efcde917af407a6031ecff68edd51fce7b83d104'

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

Conflicts:
libavformat/flacenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/flacenc.c
libavformat/oggenc.c
libavformat/vorbiscomment.c
libavformat/vorbiscomment.h