highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'ba8efac977f4276f05274947b2b67d144cbc965a'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2013-04-11 02:03:31 +02:00
parent 5714812237 ba8efac977
commit d9d7c54960
4 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/filtergraphs/channelmap
View File

@@ -1 +1 @@
channelmap=map=1\,2\,0\,5\,3\,4:channel_layout=5.1
channelmap=map=1|2|0|5|3|4:channel_layout=5.1