H.261 stuff

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

diff --git a/Changelog b/Changelog
index fa6f347..f6cfd2a 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -6,6 +6,7 @@ version <next>
 - Creative ADPCM audio decoder
 - Electronic Arts Multimedia (WVE/UV2/etc.) file demuxer
 - Miro VideoXL (VIXL) video decoder
+- H.261 video encoder
 
 version 0.4.9-pre1:
 

diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index db31453..818b725 100644 (file)
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -723,7 +723,9 @@ following image formats are supported:
 @item MSMPEG4 V3             @tab  X  @tab  X @tab Also known as DIVX3
 @item WMV7                   @tab  X  @tab  X
 @item WMV8                   @tab  X  @tab  X @tab Not completely working
-@item H263(+)                @tab  X  @tab  X @tab Also known as Real Video 1.0
+@item H.261                  @tab  X  @tab  X
+@item H.263(+)               @tab  X  @tab  X @tab Also known as Real Video 1.0
+@item H.264                  @tab     @tab  X
 @item MJPEG                  @tab  X  @tab  X 
 @item Lossless MJPEG         @tab  X  @tab  X
 @item Apple MJPEG-B          @tab     @tab  X
@@ -735,7 +737,6 @@ following image formats are supported:
 @item Asus v1                @tab  X  @tab  X @tab fourcc: ASV1
 @item Asus v2                @tab  X  @tab  X @tab fourcc: ASV2
 @item Creative YUV           @tab     @tab  X @tab fourcc: CYUV
-@item H.264                  @tab     @tab  X
 @item Sorenson Video 1       @tab  X  @tab  X @tab fourcc: SVQ1
 @item Sorenson Video 3       @tab     @tab  X @tab fourcc: SVQ3
 @item On2 VP3                @tab     @tab  X @tab still experimental