From b06b45c454be57f72157f599837f627e690f1cc2 Mon Sep 17 00:00:00 2001 From: Mike Melanson Date: Thu, 28 Oct 2004 19:40:57 +0000 Subject: [PATCH] H.261 stuff Originally committed as revision 3651 to svn://svn.ffmpeg.org/ffmpeg/trunk --- Changelog | 1 + doc/ffmpeg-doc.texi | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index fa6f347bd1..f6cfd2aa12 100644 --- a/Changelog +++ b/Changelog @@ -6,6 +6,7 @@ version - 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 db314530d4..818b725371 100644 --- 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