[FFmpeg-cvslog] Merge commit 'd816e125fe1fa5c909b706d47904a4d6c1799996'

Michael Niedermayer git at videolan.org
Thu Jun 5 19:05:49 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun  5 18:55:44 2014 +0200| [151f88d507f18c0aae011f9e88f40c508c11640f] | committer: Michael Niedermayer

Merge commit 'd816e125fe1fa5c909b706d47904a4d6c1799996'

* commit 'd816e125fe1fa5c909b706d47904a4d6c1799996':
  dict: const correctness for av_dict_get() and av_dict_copy()

Conflicts:
	libavutil/dict.c
	libavutil/dict.h

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

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





More information about the ffmpeg-cvslog mailing list