*** empty log message ***

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

1 files changed, 72 insertions, 14 deletions

diff --git a/DOCS/codecs.conf b/DOCS/codecs.conf
index 2cc15292b9..2371bd7b59 100644
--- a/DOCS/codecs.conf
+++ b/DOCS/codecs.conf
@@ -2,12 +2,14 @@
 
 videocodec mpeg12
   info "MPEG 1 or 2"
+  status ":-)"
   format 0x1
   driver libmpeg2
   out YV12
 
 videocodec mpeg4
   info "Microsoft MPEG-4 v1/v2"
+  status ":-)"
   comment "No postprocessing"
   fourcc MPG4,mpg4
   fourcc MP42,mp42
@@ -18,6 +20,7 @@ videocodec mpeg4
 
 videocodec divxds
   info "DivX ;-) (MS MPEG-4 v3)"
+  status ":-)"
   comment "DivX rulez ;-)"
   fourcc MP43,mp43 div3   ; fourcc mapping to div3
   fourcc DIV5,div5 div3
@@ -31,6 +34,7 @@ videocodec divxds
 
 videocodec divx
   info "DivX ;-) (MS MPEG-4 v3)"
+  status ":-)"
   comment "DivX rulez ;-)"
   fourcc MP43,mp43 div3   ; fourcc mapping to div3
   fourcc DIV5,div5 div3
@@ -43,6 +47,7 @@ videocodec divx
   
 videocodec odivx
   info "OpenDivX (MPEG-4 v2)"
+  status ":-)"
   fourcc DIVX,divx
   fourcc DIV1,div1 divx
   driver odivx
@@ -50,6 +55,7 @@ videocodec odivx
 
 videocodec indeo5
   info "Intel Indeo 5"
+  status ":-)"
   fourcc IV50,iv50
   driver vfw
   dll "ir50_32.dll"
@@ -58,6 +64,7 @@ videocodec indeo5
 
 videocodec indeo4
   info "Intel Indeo 4.1"
+  status ":-|"
   comment "upside-down"
   fourcc IV41,iv41
   driver vfw
@@ -66,6 +73,7 @@ videocodec indeo4
 
 videocodec indeo3
   info "Intel Indeo 3.1/3.2"
+  status ":-|"
   comment "upside-down"
   fourcc IV31,iv31
   fourcc IV32,iv32
@@ -75,6 +83,7 @@ videocodec indeo3
 
 videocodec cvid
   info "Cinepak Video"
+  status ":-)"
   fourcc cvid
   driver vfw
   dll "iccvid.dll"
@@ -83,13 +92,15 @@ videocodec cvid
 
 videocodec cram
   info "Microsoft Video 1"
-  fourcc cram,CRAM
+  status ":-|"
+  fourcc cram,CRAM,MSVC
   driver vfw
   dll "msvidc32.dll"
   out BGR24,BGR15
 
 videocodec vcr2
   info "ATI VCR-2"
+  status ":-)"
   fourcc VCR2
   driver vfw
   dll "ativcr2.dll"
@@ -98,6 +109,8 @@ videocodec vcr2
 
 videocodec i263
   info "I263"
+  status ":-)"
+  fourcc I420 i263      ; they use the same dll.. dunno if it (i420) works
   fourcc I263,i263
   driver vfw
   dll "i263_32.drv"
@@ -106,6 +119,7 @@ videocodec i263
 
 videocodec mjpeg
   info "Motion JPEG"
+  status ":-)"
   fourcc MJPG
   driver vfw
   dll "mcmjpg32.dll"
@@ -115,6 +129,7 @@ videocodec mjpeg
 
 videocodec wmv1
   info "Windows Media Video 7"
+  status ":-)"
   fourcc WMV1
   driver dshow
   dll "wmvds32.ax"
@@ -124,7 +139,7 @@ videocodec wmv1
 
 videocodec ap41
   info "AngelPotion Definitive V1"
-;  status "NOT WORKING"
+  status ":-("
   fourcc AP41
   driver vfw
   dll "apmpg4v1.dll"
@@ -133,7 +148,7 @@ videocodec ap41
 
 videocodec tm20
   info "TrueMotion 2.0"
-;  status "NOT WORKING"
+  status ":-("
   fourcc TM20
   driver dshow
   dll "tm20dec.ax"
@@ -143,7 +158,7 @@ videocodec tm20
 
 videocodec hfyu
   info "HuffYUV"
-;  status "NOT WORKING"
+  status ":-("
   fourcc HFYU
   driver vfw
   dll "huffyuv.dll"
@@ -152,7 +167,7 @@ videocodec hfyu
 
 videocodec mszh
   info "AVImszh"
-;  status "NOT WORKING"
+  status ":-("
   fourcc MSZH
   driver vfw
   dll "avimszh.dll"
@@ -161,15 +176,35 @@ videocodec mszh
 
 videocodec zlib
   info "AVIzlib"
-;  status "NOT WORKING"
+  status ":-("
   fourcc ZLIB
   driver vfw
   dll "avizlib.dll"
   out YUY2
   out BGR32,BGR24,BGR15
 
+videocodec mvw1
+  info "Motion Wavelets"
+  status "X-("
+  fourcc MVW1
+  driver vfw
+  dll "icmw_32.dll"
+;  out YUY2
+  out BGR32,BGR24,BGR15
+
+videocodec wmv8
+  info "Windows Media Video 8"
+  status "X-("
+  fourcc WMV2
+  driver dshow
+  dll "wmv8ds32.ax"
+;  guid ?
+;  out YUY2
+  out BGR32,BGR24,BGR16,BGR15
+
 audiocodec divx
   info "DivX audio (WMA)"
+  status ":-)"
   format 0x160
   format 0x161
   driver acm
@@ -177,21 +212,24 @@ audiocodec divx
 
 audiocodec msadpcm
   info "MS ADPCM"
+  status ":-)"
   format 0x2
   driver acm
   dll "msadp32.acm"
 
 ; 3DNow! autodetection?
-audiocodec mp3acm
-  info "MPEG layer-3"
-  comment "Optimized to Intel MMX/SSE"
-  format 0x55
-  driver acm
-  dll "l3codeca.acm"
-  flags seekable
+;audiocodec mp3acm
+;  info "MPEG layer-3"
+;  status ":-)"
+;  comment "Optimized to Intel MMX/SSE"
+;  format 0x55
+;  driver acm
+;  dll "l3codeca.acm"
+;  flags seekable
 
 audiocodec mp3
   info "MPEG layer-2,3"
+  status ":-)"
   comment "Optimized to AMD 3Dnow!"
   format 0x50
   format 0x55
@@ -200,12 +238,14 @@ audiocodec mp3
 
 audiocodec imaadpcm
   info "IMA ADPCM"
+  status ":-)"
   format 0x11
   driver acm
   dll "imaadp32.acm"
   
 audiocodec msgsmacm
   info "MS GSM"
+  status ":-)"
   format 0x31
   format 0x32
   driver acm
@@ -213,36 +253,54 @@ audiocodec msgsmacm
 
 audiocodec msgsm
   info "MS GSM"
+  status ":-)"
   format 0x31
   format 0x32
   driver msgsm
 
 audiocodec alaw
   info "aLaw"
+  status ":-)"
   format 0x6
   driver alaw
 
 audiocodec ulaw
   info "uLaw"
-;  status "?"
+  status ":-|"
   format 0x7
   driver alaw
   comment "aLaw driver seems to play it, but it's weird.. Or is uLaw just shit? :)"
 
 audiocodec pcm
   info "Uncompressed PCM"
+  status ":-)"
   format 0x1
   driver pcm
 
 audiocodec ac3
   info "AC3"
+  status ":-)"
   format 0x2000
   driver libac3
 
 audiocodec voxware
   info "VoxWare"
+  status ":-|"
   format 0x75
   driver dshow
   dll "voxmsdec.ax"
   guid 0x73f7a062, 0x8829, 0x11d1, 0xb5, 0x50, 0x00, 0x60, 0x97, 0x24, 0x2d, 0x8d
 
+audiocodec acelp
+  info "ACELP.net Sipro Lab Audio Decoder"
+  status "X-("
+  format 0x130
+  driver dshow
+  dll "acelpdec.ax"
+  guid 0x4009F700, 0xAEBA, 0x11D1, 0x83, 0x44, 0x00, 0xC0, 0x4F, 0xB9, 0xE2, 0xB7
+
+audiocodec imc
+  info "Intel Music Coder"
+  status "X-("
+  format 0x401
+;  driver gebasz