[FFmpeg-soc] [soc]: r4967 - concat/doc/ffmpeg-doc.texi.diff

[gkovacs]

Author: gkovacs
Date: Fri Aug  7 01:34:01 2009
New Revision: 4967

Log:
added concatenation example for docs

Modified:
   concat/doc/ffmpeg-doc.texi.diff

Modified: concat/doc/ffmpeg-doc.texi.diff
==============================================================================
--- concat/doc/ffmpeg-doc.texi.diff	Fri Aug  7 01:33:30 2009	(r4966)
+++ concat/doc/ffmpeg-doc.texi.diff	Fri Aug  7 01:34:01 2009	(r4967)
@@ -1 +1,17 @@
-
+diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
+index ad0af07..5cc6ead 100644
+--- a/doc/ffmpeg-doc.texi
++++ b/doc/ffmpeg-doc.texi
+@@ -105,6 +105,12 @@ ffmpeg -i /tmp/a.wav -s 640x480 -i /tmp/a.yuv /tmp/a.mpg
+ Converts the audio file a.wav and the raw YUV video file a.yuv
+ to MPEG file a.mpg.
+ 
++* You can also concatenate several input files into a single output file:
++
++ at example
++ffmpeg -i part1.avi,part2.mpg,part3.mp4 fullvideo.avi
++ at end example
++
+ * You can also do audio and video conversions at the same time:
+ 
+ @example