diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-24 21:34:54 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-24 21:34:54 +0200 |
commit | 244682dd086233b71e885d2fb1ec0dd3396b94bc (patch) | |
tree | 6a314fbc579bad35bb666ee469d28e2b2872e57c /doc | |
parent | 5c44c2de8045ea0b9787a95053f542b1b3b860d2 (diff) | |
parent | 145a8096d53c20da7898539e521e6d4267ab2f09 (diff) | |
download | ffmpeg-244682dd086233b71e885d2fb1ec0dd3396b94bc.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
log: Only include unistd.h if configure found it
ape: create audio stream before reading tags.
mov: make a length variable larger.
image2: Add "start_number" private option to the demuxer
image2: Add "start_number" private option to the muxer
avconv: remove a forgotten debugging printf.
avconv: use more descriptive names for hardcoded filters.
avconv: remove redundant handling of async.
doc/filters: fix typo.
h264: use asm cabac reader under a generic condition
Conflicts:
ffmpeg.c
libavformat/img2dec.c
libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/filters.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 0a5bea6299..5fef9d19cd 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -698,7 +698,7 @@ Desired output channel layout. Defaults to stereo. Map channels from inputs to output. The argument is a comma-separated list of mappings, each in the @code{@var{input_idx}.@var{in_channel}-@var{out_channel}} form. @var{input_idx} is the 0-based index of the input stream. @var{in_channel} -can be either the name of the input channel (e.g. FR for front left) or its +can be either the name of the input channel (e.g. FL for front left) or its index in the specified input stream. @var{out_channel} is the name of the output channel. @end table |