[FFmpeg-devel] [PATCH] doc/faq: improve concatenation entry.

[Stefano Sabatini]

On date Wednesday 2012-12-19 22:33:47 +0100, Clément Bœsch encoded:
> ---
>  doc/faq.texi | 15 +++++++++++----
>  1 file changed, 11 insertions(+), 4 deletions(-)
> 
> diff --git a/doc/faq.texi b/doc/faq.texi
> index a7b34b1..273804d 100644
> --- a/doc/faq.texi
> +++ b/doc/faq.texi
> @@ -265,12 +265,19 @@ the other; it can be done using the
>  
>  There are several solutions, depending on the exact circumstances.
>  
> - at subsection Concatenating using filters
> + at subsection Concatenating using the concat @emph{filter}
>  
> -FFmpeg has a @url{http://ffmpeg.org/ffmpeg.html#concat-1, @code{concat}}
> -filter designed specifically for that, with examples in the documentation.
> +FFmpeg has a @url{http://ffmpeg.org/ffmpeg-filters.html#concat,
> + at code{concat}} filter designed specifically for that, with examples in the
> +documentation. This operation is recommended if you need to re-encode.
>  
> - at subsection Concatenating at the file level
> + at subsection Concatenating using the concat @emph{demuxer}
> +
> +FFmpeg has a @url{https://www.ffmpeg.org/ffmpeg-formats.html#concat,
> + at code{concat}} demuxer which you can use when you want to avoid a re-encode and
> +your format doesn't support file level concatenation.
> +
> + at subsection Concatenating using the concat @emph{protocol} (file level)

LGTM, thanks.
-- 
FFmpeg = Fancy & Fantastic Mere Portable Epic Gnome