i420, indeo5 fixes/changes

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

1 files changed, 18 insertions, 18 deletions

diff --git a/DOCS/codecs.conf b/DOCS/codecs.conf
index 1fcb607689..503bc7fa85 100644
--- a/DOCS/codecs.conf
+++ b/DOCS/codecs.conf
@@ -38,7 +38,6 @@ videocodec divx
   fourcc DIV5,div5 div3   ; DivX 3.20 
   fourcc DIV6,div6 div4   ;   -||-
   fourcc DIV3,div3,DIV4,div4
-  fourcc AP41 DIV3  ; AngelPotion definitive MPEG4 (yet another stolen stuff)
   driver vfw
   dll "divxc32.dll"
   out YUY2 yuvhack
@@ -52,15 +51,6 @@ videocodec odivx
   driver odivx
   out YV12
 
-videocodec indeo5
-  info "Intel Indeo 5"
-  status working
-  fourcc IV50,iv50
-  driver vfw
-  dll "ir50_32.dll"
-  out YUY2
-  out BGR32,BGR24,BGR15
-
 videocodec indeo5ds
   info "Intel Indeo 5"
   status untested
@@ -71,6 +61,15 @@ videocodec indeo5ds
   out YUY2
   out BGR32,BGR24,BGR16,BGR15
 
+videocodec indeo5
+  info "Intel Indeo 5"
+  status working
+  fourcc IV50,iv50
+  driver vfw
+  dll "ir50_32.dll"
+  out YUY2
+  out BGR32,BGR24,BGR15
+
 videocodec indeo4
   info "Intel Indeo 4.1"
   status buggy
@@ -119,8 +118,7 @@ videocodec vcr2
 videocodec i263
   info "I263"
   status working
-  fourcc I420 i263      ; (map!) they use the same dll.. dunno if it (i420) worx
-  fourcc I263,i263
+  fourcc I263,i263,I420,i420
   driver vfw
   dll "i263_32.drv"
   out YUY2
@@ -147,13 +145,15 @@ videocodec wmv1
   out BGR32,BGR24,BGR16,BGR15
 
 videocodec ap41
-  info "AngelPotion Definitive V1"
-  status crashing
-  fourcc AP41
-  driver vfw
-  dll "apmpg4v1.dll"
+  info "AngelPotion Definitive V1"	; yet another stolen stuff
+  status working
+  fourcc AP41 div3  
+  fourcc 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,BGR15
+  out BGR32,BGR24,BGR16,BGR15
 
 videocodec tm20
   info "TrueMotion 2.0"