[SCM] libav/experimental: remove confusing divx note

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:51:45 UTC 2013


The following commit has been merged in the experimental branch:
commit 2bc5da7bf9c293564a75ff3ef082146e7b947489
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Oct 3 21:09:02 2006 +0000

    remove confusing divx note
    
    Originally committed as revision 6546 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index cc51105..c41807d 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -764,10 +764,10 @@ following image formats are supported:
 @item Supported Codec @tab Encoding @tab Decoding @tab Comments
 @item MPEG-1 video           @tab  X  @tab  X
 @item MPEG-2 video           @tab  X  @tab  X
- at item MPEG-4                 @tab  X  @tab  X @tab also known as DivX4/5
+ at item MPEG-4                 @tab  X  @tab  X
 @item MSMPEG4 V1             @tab  X  @tab  X
 @item MSMPEG4 V2             @tab  X  @tab  X
- at item MSMPEG4 V3             @tab  X  @tab  X @tab also known as DivX3
+ at item MSMPEG4 V3             @tab  X  @tab  X
 @item WMV7                   @tab  X  @tab  X
 @item WMV8                   @tab  X  @tab  X @tab not completely working
 @item H.261                  @tab  X  @tab  X

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list