diff options
author | Clément Bœsch <ubitux@gmail.com> | 2012-12-20 00:20:05 +0100 |
---|---|---|
committer | Clément Bœsch <ubitux@gmail.com> | 2012-12-20 00:36:08 +0100 |
commit | 52b866471ec97dd03d92ad1df4c5bdba54f285c0 (patch) | |
tree | 48d2406899759fd4a3238eb833ac95acfeb22cc3 | |
parent | 521a963a7d72887d1716be50a8c4eb02ba1dfd9f (diff) | |
download | ffmpeg-52b866471ec97dd03d92ad1df4c5bdba54f285c0.tar.gz |
doc/faq: move filter links to the ffmpeg-filters.html page.
-rw-r--r-- | doc/faq.texi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/faq.texi b/doc/faq.texi index 110b1b4ec2..4d1d071bec 100644 --- a/doc/faq.texi +++ b/doc/faq.texi @@ -245,18 +245,18 @@ invoking ffmpeg with several @option{-i} options. For audio, to put all channels together in a single stream (example: two mono streams into one stereo stream): this is sometimes called to @emph{merge} them, and can be done using the -@url{http://ffmpeg.org/ffmpeg.html#amerge, @code{amerge}} filter. +@url{http://ffmpeg.org/ffmpeg-filters.html#amerge, @code{amerge}} filter. @item For audio, to play one on top of the other: this is called to @emph{mix} them, and can be done by first merging them into a single stream and then -using the @url{http://ffmpeg.org/ffmpeg.html#pan, @code{pan}} filter to mix +using the @url{http://ffmpeg.org/ffmpeg-filters.html#pan, @code{pan}} filter to mix the channels at will. @item For video, to display both together, side by side or one on top of a part of the other; it can be done using the -@url{http://ffmpeg.org/ffmpeg.html#overlay, @code{overlay}} video filter. +@url{http://ffmpeg.org/ffmpeg-filters.html#overlay, @code{overlay}} video filter. @end itemize |