[FFmpeg-cvslog] Merge commit 'ac20e3ab8ed497549ee2a62754f01eee5e7a5066'
Michael Niedermayer
git at videolan.org
Thu Apr 11 01:37:24 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 01:25:08 2013 +0200| [314be1933e3a39abd6576184786703701ced4415] | committer: Michael Niedermayer
Merge commit 'ac20e3ab8ed497549ee2a62754f01eee5e7a5066'
* commit 'ac20e3ab8ed497549ee2a62754f01eee5e7a5066':
af_amix: switch to an AVOptions-based system.
Conflicts:
libavfilter/af_amix.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=314be1933e3a39abd6576184786703701ced4415
---
More information about the ffmpeg-cvslog
mailing list