updated

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1527 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 10 insertions, 17 deletions

diff --git a/DOCS/codecs.conf b/DOCS/codecs.conf
index ce37cbadf2..6d0a2a934f 100644
--- a/DOCS/codecs.conf
+++ b/DOCS/codecs.conf
@@ -29,6 +29,7 @@ videocodec divxds
   fourcc DIV5,div5 div3
   fourcc DIV6,div6 div4
   fourcc DIV3,div3,DIV4,div4
+  fourcc AP41 div3	  ; AngelPotion stuff
   driver dshow
   dll "divx_c32.ax"
   guid 0x82CCd3E0, 0xF71A, 0x11D0, 0x9f, 0xe5, 0x00, 0x60, 0x97, 0x78, 0xaa, 0xaa
@@ -78,6 +79,7 @@ videocodec divx
   fourcc DIV5,div5 div3   ; DivX 3.20 
   fourcc DIV6,div6 div4   ;   -||-
   fourcc DIV3,div3,DIV4,div4
+  fourcc AP41 div3	  ; AngelPotion stuff
   driver vfw
   dll "divxc32.dll"
   out YUY2 yuvhack
@@ -92,6 +94,7 @@ videocodec odivx
   fourcc DIV1,div1 divx
   fourcc MP4S,mp4s	; ISO MPEG-4 Video V1
   fourcc MP43,mp43,DIV3,div3,DIV4,div4 DIV3  ; for DivX4Linux only!
+  fourcc AP41 DIV3	  ; AngelPotion stuff
   format 0x4
   driver odivx
   dll "opendivx decore"
@@ -105,11 +108,12 @@ videocodec divx4
   fourcc DIV1,div1 divx
   fourcc MP4S,mp4s	; ISO MPEG-4 Video V1
   fourcc MP43,mp43,DIV3,div3,DIV4,div4 DIV3  ; for DivX4Linux only!
+  fourcc AP41 DIV3	  ; AngelPotion stuff
   format 0x4
   driver divx4
   dll "libdivxdecore.0"
 ;  out YV12   ; works, but odivx driver is faster with YV12 (DEC_USER)
-  out I420
+;  out I420
   out YUY2
   out UYVY
   out BGR32,BGR24,BGR16,BGR15
@@ -156,7 +160,7 @@ videocodec ffi263
 
 videocodec ffh263
   info "FFmpeg H263+ decoder"
-  status untested
+  status working
   fourcc H263,U263
   driver ffmpeg
   dll h263
@@ -170,6 +174,7 @@ videocodec ffdivx
   fourcc DIV5,div5 div3   ; DivX 3.20 
   fourcc DIV6,div6 div4   ;   -||-
   fourcc DIV3,div3,DIV4,div4
+  fourcc AP41 div3	  ; AngelPotion stuff
   driver ffmpeg
   dll msmpeg4
   out YV12
@@ -188,9 +193,9 @@ videocodec ffodivx
 
 videocodec ffmpeg12
   info "FFmpeg-1"
-  status buggy
+  status working
   format 0x10000001  ; mpeg 1
-  format 0x10000002  ; mpeg 2 is broken
+  format 0x10000002  ; mpeg 2
   driver ffmpeg
   dll "mpegvideo"
   out YV12
@@ -280,8 +285,7 @@ videocodec wmv7
 
 videocodec wmv8
   info "Windows Media Video 8"
-  status crashing
-  comment "Floating point exception"
+  status working
   fourcc WMV2
   driver dshow
   dll "wmv8ds32.ax"
@@ -289,17 +293,6 @@ videocodec wmv8
   out YUY2
   out BGR32,BGR24,BGR16,BGR15
 
-videocodec ap41
-  info "AngelPotion Definitive V1"	; yet another stolen stuff
-  comment "using the DivX ;-) codec"
-  status working
-  fourcc AP41 div3  
-  driver dshow
-  dll "divx_c32.ax"		; no need to use apmpg4v1.dll
-  guid 0x82CCd3E0, 0xF71A, 0x11D0, 0x9f, 0xe5, 0x00, 0x60, 0x97, 0x78, 0xaa, 0xaa
-  out YUY2
-  out BGR32,BGR24,BGR16,BGR15
-
 videocodec tm20
   info "TrueMotion 2.0"
   status crashing