diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 02:03:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 02:10:12 +0200 |
| commit | d9d7c54960804262bff36939c8392087aa92a8d0 (patch) | |
| tree | fc20374a6cba10003160c490bf00c4442081c1ef /libavfilter/vf_null.c | |
| parent | 57148122375a8f7aa387bef6b993b936dbb70777 (diff) | |
| parent | ba8efac977f4276f05274947b2b67d144cbc965a (diff) | |
| download | ffmpeg-d9d7c54960804262bff36939c8392087aa92a8d0.tar.gz | |
Merge commit 'ba8efac977f4276f05274947b2b67d144cbc965a'
* commit 'ba8efac977f4276f05274947b2b67d144cbc965a':
af_channelmap: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/af_channelmap.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_null.c')
0 files changed, 0 insertions, 0 deletions