Update the FAQ with the current status of image formats.

patch by Michel Bardiaux, mbardiaux at mediaxim dot be

Originally committed as revision 6075 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/doc/faq.texi b/doc/faq.texi
index 64b46faee45b02962271c6833bff3dfcf06aee0e..fd449344029f051a3c3c9c706cd0fa228c04a2a5 100644 (file)
--- a/doc/faq.texi
+++ b/doc/faq.texi
@@ -21,7 +21,7 @@ documentation.
 If the JPEGs are named img1.jpg, img2.jpg, img3.jpg,..., use:
 
 @example
-  ffmpeg -i img%d.jpg /tmp/a.mpg
+  ffmpeg -f image2 -i img%d.jpg /tmp/a.mpg
 @end example
 
 @samp{%d} is replaced by the image number.
@@ -30,6 +30,8 @@ If the JPEGs are named img1.jpg, img2.jpg, img3.jpg,..., use:
 
 The same system is used for the other image formats.
 
+(Note: you need -f image2 for all image formats except GIF; see next section).
+
 @section Only GIF is listed by -format. Is that the only accepted image format?
 
 No, there are more; they are listed among the video codecs:
@@ -136,7 +138,7 @@ to Subversion HEAD".
 
 @section -f jpeg doesn't work.
 
-Try '-f image -img jpeg test%d.jpg'.
+Try '-f image2 test%d.jpg'.
 
 @section Why can I not change the framerate?