diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-05-27 12:32:59 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-05-27 12:32:59 +0000 |
| commit | 842eabc5f91d40019604517791809ae47c59ef1f (patch) | |
| tree | aada2d44fbcff9c32a458510dec53eb9504b9eee /doc/faq.texi | |
| parent | ae52bbe5de5c36a56f5e80076ae383203366664c (diff) | |
| download | ffmpeg-842eabc5f91d40019604517791809ae47c59ef1f.tar.gz | |
cosmetics: XviD is now called Xvid.
Originally committed as revision 13465 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc/faq.texi')
| -rw-r--r-- | doc/faq.texi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/faq.texi b/doc/faq.texi index 7fea49bdd6..384f7925e4 100644 --- a/doc/faq.texi +++ b/doc/faq.texi @@ -82,7 +82,7 @@ The following list of video codecs should work on most Windows systems: @item wmv2 .asf only @item mpeg4 -only if you have some MPEG-4 codec installed like ffdshow or XviD +only if you have some MPEG-4 codec installed like ffdshow or Xvid @item mpeg1 .mpg only @end table @@ -194,9 +194,9 @@ Try '-f image2 test%d.jpg'. Some codecs, like MPEG-1/2, only allow a small number of fixed framerates. Choose a different codec with the -vcodec command line option. -@section How do I encode XviD or DivX video with ffmpeg? +@section How do I encode Xvid or DivX video with ffmpeg? -Both XviD and DivX (version 4+) are implementations of the ISO MPEG-4 +Both Xvid and DivX (version 4+) are implementations of the ISO MPEG-4 standard (note that there are many other coding formats that use this same standard). Thus, use '-vcodec mpeg4' to encode these formats. The default fourcc stored in an MPEG-4-coded file will be 'FMP4'. If you want |