diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 02:17:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 02:17:28 +0200 |
| commit | f17651bd160d28d3a34c08c7aa537ef86defcc94 (patch) | |
| tree | ee86ff9b67a8a1fa21eebe0dea0cf1bdffbf9834 /doc/filters.texi | |
| parent | d9d7c54960804262bff36939c8392087aa92a8d0 (diff) | |
| parent | 3f14febbdf7c93bbd186399da27991180e5916b6 (diff) | |
| download | ffmpeg-f17651bd160d28d3a34c08c7aa537ef86defcc94.tar.gz | |
Merge commit '3f14febbdf7c93bbd186399da27991180e5916b6'
* commit '3f14febbdf7c93bbd186399da27991180e5916b6':
af_channelsplit: switch to an AVOptions-based system.
Conflicts:
libavfilter/af_channelsplit.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/filters.texi')
0 files changed, 0 insertions, 0 deletions