[FFmpeg-cvslog] Merge commit '1ba95a9cca57b023b9b9de071a5671fc05b05e58'
Michael Niedermayer
git at videolan.org
Fri Apr 12 14:30:54 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 12 14:25:27 2013 +0200| [46de9ba5981531dcbfe05943448bebc5569fb3df] | committer: Michael Niedermayer
Merge commit '1ba95a9cca57b023b9b9de071a5671fc05b05e58'
* commit '1ba95a9cca57b023b9b9de071a5671fc05b05e58':
lavfi: add avfilter_init_dict() for initializing a filter with a dict.
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=46de9ba5981531dcbfe05943448bebc5569fb3df
---
More information about the ffmpeg-cvslog
mailing list