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 /doc | |
| 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 'doc')
| -rw-r--r-- | doc/filters.texi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 2669804efb..de0e0716eb 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -1208,7 +1208,7 @@ This filter accepts the following named parameters: Channel layout of the output stream. @item map -Map channels from input to output. The argument is a comma-separated list of +Map channels from input to output. The argument is a '|'-separated list of mappings, each in the @code{@var{in_channel}-@var{out_channel}} or @var{in_channel} form. @var{in_channel} can be either the name of the input channel (e.g. FL for front left) or its index in the input channel layout. @@ -1222,14 +1222,14 @@ output channels preserving index. For example, assuming a 5.1+downmix input MOV file @example -ffmpeg -i in.mov -filter 'channelmap=map=DL-FL\,DR-FR' out.wav +ffmpeg -i in.mov -filter 'channelmap=map=DL-FL|DR-FR' out.wav @end example will create an output WAV file tagged as stereo from the downmix channels of the input. To fix a 5.1 WAV improperly encoded in AAC's native channel order @example -ffmpeg -i in.wav -filter 'channelmap=1\,2\,0\,5\,3\,4:channel_layout=5.1' out.wav +ffmpeg -i in.wav -filter 'channelmap=1|2|0|5|3|4:channel_layout=5.1' out.wav @end example @section join |