[FFmpeg-cvslog] Merge commit '3f14febbdf7c93bbd186399da27991180e5916b6'
Michael Niedermayer
git at videolan.org
Thu Apr 11 02:23:40 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 02:17:28 2013 +0200| [f17651bd160d28d3a34c08c7aa537ef86defcc94] | committer: Michael Niedermayer
Merge commit '3f14febbdf7c93bbd186399da27991180e5916b6'
* commit '3f14febbdf7c93bbd186399da27991180e5916b6':
af_channelsplit: switch to an AVOptions-based system.
Conflicts:
libavfilter/af_channelsplit.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f17651bd160d28d3a34c08c7aa537ef86defcc94
---
More information about the ffmpeg-cvslog
mailing list