ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Wed Aug 13 22:39:54 2014 +0200| [2ba45778095cdd6e1438644e4797b76e9de6c672] | committer: Michael Niedermayer
Merge commit 'a8c104a511f97e4ea617df73b31737e28a8a5126' * commit 'a8c104a511f97e4ea617df73b31737e28a8a5126': AVOption: add support for dictionary types. Conflicts: libavutil/opt.c libavutil/opt.h libavutil/version.h Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ba45778095cdd6e1438644e4797b76e9de6c672 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog