[FFmpeg-cvslog] Merge commit '38c1466ca41c73c7ce347da702362cb69c151716'

Michael Niedermayer git at videolan.org
Sat Jan 26 13:43:50 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 26 13:34:30 2013 +0100| [e7e14bc69a606a6bec82efef729263cd38f122d4] | committer: Michael Niedermayer

Merge commit '38c1466ca41c73c7ce347da702362cb69c151716'

* commit '38c1466ca41c73c7ce347da702362cb69c151716':
  dict: add av_dict_parse_string()
  doc: support multitable in texi2pod

Conflicts:
	doc/APIchanges
	libavutil/version.h

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

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





More information about the ffmpeg-cvslog mailing list