[FFmpeg-cvslog] r9176 - trunk/doc/faq.texi

[Diego Biurrun]

On Sat, Jun 02, 2007 at 11:50:45PM +0200, victor wrote:
> 
> Log:
> ?Add FAQ entry for video joining
> patch by V?ctor Paesa, wzrlpy dontuseme arsystel com

Remove the "patch by" line, it's unneeded.

> --- trunk/doc/faq.texi	(original)
> +++ trunk/doc/faq.texi	Sat Jun  2 23:50:45 2007
> @@ -250,6 +250,63 @@ not what you use to play it.
>  
> + at section How can I join video files?
> +
> +A few multimedia containers (MPEG1, MPEG2 PS, DV) allow to join video files by

MPEG-1, MPEG-2

> +equally humble @code{copy} under Win32), and finally transcoding back to your

Windows

> +Notice too that you may avoid the huge intermediate files by taking advantage

Also notice

Diego