fixes

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

1 files changed, 18 insertions, 25 deletions

diff --git a/etc/codecs.conf b/etc/codecs.conf
index 16438f8676..4126415020 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -6,9 +6,17 @@
 
 ; =============== Win32/libmpeg2/ProjectMayo MPEG CODECS =====================
 
+videocodec vivo
+  info "Vivo H.263"
+  status working
+  fourcc VIVO,vivo vivo
+  driver vfw
+  dll "ivvideo.dll"
+  out BGR32,BGR24,BGR16 flip
+
 videocodec u263
   info "UB Video H.263+ Decoder"
-  comment "added by Juanjo (also working with VIVO)"
+  comment "added by Juanjo"
   status working
   fourcc U263
   fourcc vivo,VIVO U263
@@ -64,7 +72,6 @@ videocodec mpeg4ds
 videocodec mpeg4
   info "Microsoft MPEG-4 v1/v2"
   status working
-;  comment "No postprocessing"
   fourcc MPG4,mpg4
   fourcc MP42,mp42
   fourcc DIV2 mp42
@@ -135,18 +142,9 @@ videocodec divx4vfw
   out YUY2
   out BGR32,BGR24,BGR15
 
-videocodec vivo
-  info "Vivo H.263"
-  status working
-  fourcc VIVO,vivo vivo
-  driver vfw
-  dll "ivvideo.dll"
-  out BGR32,BGR24,BGR16 flip
-
 videocodec i263
   info "I263"
   status working
-  comment "also working with VIVO"
   fourcc I263,i263,I420,i420
   fourcc vivo,VIVO I263
   driver vfw
@@ -211,7 +209,6 @@ videocodec ffdivx
 videocodec ffodivx
   info "FFmpeg OpenDivX"
   status working
-;  comment "doesn't support >= 4.0alpha48 movies yet"
   fourcc DIVX,divx
   fourcc DIV1,div1 divx
   fourcc MP4S,mp4s	; ISO MPEG-4 Video V1
@@ -229,7 +226,6 @@ videocodec ffmpeg12
   dll "mpegvideo"
   out YV12
 
-
 videocodec mpegpes
   info "Mpeg PES output (.mpg or DVB card)"
   comment "for hardware decoding"
@@ -307,7 +303,7 @@ videocodec cram
   info "Microsoft Video 1"
   comment "8bpp is only supported by GGI (?)"
   status working
-  fourcc cram,CRAM,MSVC
+  fourcc cram,CRAM,MSVC CRAM
   driver vfw
   dll "msvidc32.dll"
   out BGR8,BGR15,BGR24
@@ -400,21 +396,19 @@ videocodec huffyuv
 videocodec mszh
   info "AVImszh"
   status crashing
-  comment "calls RegEnumValueA()"
   fourcc MSZH
   driver vfw
   dll "avimszh.dll"
-  out YUY2
+;  out YUY2
   out BGR32,BGR24,BGR15
 
 videocodec zlib
   info "AVIzlib"
   status crashing
-  comment "calls RegEnumValueA()"
   fourcc ZLIB
   driver vfw
   dll "avizlib.dll"
-  out YUY2
+;  out YUY2
   out BGR32,BGR24,BGR15
 
 videocodec mwv1
@@ -459,7 +453,7 @@ videocodec asv1
   out BGR32,BGR24,BGR15 flip
 
 videocodec msrle
-  info "M$ RLE"
+  info "M$ RLE8"
   status working
   format 0x1
   driver rle
@@ -468,7 +462,7 @@ videocodec msrle
 
 videocodec 3ivX
   info "3ivX Delta 3.5"
-  status buggy
+  status crashing
   fourcc 3IV1
   driver dshow
   dll "3ivxdmo.dll"
@@ -479,7 +473,7 @@ videocodec 3ivX
 
 videocodec 3ivXqtx
   info "3ivX Delta 3.5"
-  status buggy
+  status crashing
   fourcc 3IV1
   driver vfw
   dll "qtx/3ivx.qtx"
@@ -557,7 +551,7 @@ videocodec cyuvxa
 
 
 videocodec null
-  info "NULL codec (no decoding)"
+  info "NULL codec (no decoding!)"
   status working
   comment "for unknown/unsupported codecs or testing"
   driver null
@@ -602,7 +596,6 @@ audiocodec msadpcm
   driver acm
   dll "msadp32.acm"
 
-; now mp3lib is stable enough!?
 audiocodec mp3
   info "MPEG layer-2, layer-3"
   status working
@@ -619,7 +612,7 @@ audiocodec mp3
 audiocodec mad
   info "MAD MPEG layer-2, layer-3"
   status working
-  comment "Optimized for ARM"
+  comment "Optimized for ARM, unstable"
   format 0x50
   format 0x55
   format 0x33706d2e  ; ".mp3" CBR/VBR MP3 (MOV files)
@@ -703,7 +696,7 @@ audiocodec ac3
 
 audiocodec voxware
   info "VoxWare"
-  status working	; audio is bubbling
+  status working
   format 0x75
   driver dshow
   dll "voxmsdec.ax"