[FFmpeg-cvslog] Merge commit 'efcde917af407a6031ecff68edd51fce7b83d104'

Michael Niedermayer git at videolan.org
Wed May 28 13:16:43 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 28 13:08:50 2014 +0200| [dff4aa6afd40bcc6c71b5a21d229fb941f9fc1eb] | committer: Michael Niedermayer

Merge commit 'efcde917af407a6031ecff68edd51fce7b83d104'

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

Conflicts:
	libavformat/flacenc.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dff4aa6afd40bcc6c71b5a21d229fb941f9fc1eb
---





More information about the ffmpeg-cvslog mailing list