From 52b866471ec97dd03d92ad1df4c5bdba54f285c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Thu, 20 Dec 2012 00:20:05 +0100 Subject: doc/faq: move filter links to the ffmpeg-filters.html page. --- doc/faq.texi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc/faq.texi') 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 -- cgit v1.2.3