codecs.conf support

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

1 files changed, 51 insertions, 30 deletions

diff --git a/DOCS/codecs.conf b/DOCS/codecs.conf
index 5defd8c576..93beaa281d 100644
--- a/DOCS/codecs.conf
+++ b/DOCS/codecs.conf
@@ -2,6 +2,12 @@
 ;  It is not functional yet! until we finish config loader,
 ;  mplayer will use codecs.c!!!
 
+videocodec mpeg12
+  info "MPEG 1 or 2"
+  format 0x1
+  driver libmpeg2
+  out YV12
+
 videocodec mpeg4
   info "Microsoft MPEG-4 v1/v2"
   comment "No postprocessing"
@@ -9,48 +15,48 @@ videocodec mpeg4
   fourcc MP42,mp42
   driver vfw
   dll "mpg4c32.dll"
-  out YUY2 noflip,yuvhack
-  out RGB32,RGB24,RGB15
+  out YUY2 yuvhack
+  out BGR32,BGR24,BGR15
 
-videocodec divx
+videocodec divxds
   info "DivX ;-) (MS MPEG-4 v3)"
   comment "DivX rulez ;-)"
   fourcc MP43,mp43 div3   ; fourcc mapping to div3
   fourcc DIV5,div5 div3
   fourcc DIV6,div6 div4
   fourcc DIV3,div3,DIV4,div3
-  driver vfw
-  dll "divxc32.dll"
-  out YUY2 noflip,yuvhack
-  out RGB32,RGB24,RGB15
-  
-videocodec divxds
+  driver dshow
+  dll "divx_c32.ax"
+  guid 0x82CCd3E0, 0xF71A, 0x11D0, 0x9f, 0xe5, 0x00, 0x60, 0x97, 0x78, 0xaa, 0xaa
+  out YUY2
+  out BGR32,BGR24,BGR16,BGR15
+
+videocodec divx
   info "DivX ;-) (MS MPEG-4 v3)"
   comment "DivX rulez ;-)"
   fourcc MP43,mp43 div3   ; fourcc mapping to div3
   fourcc DIV5,div5 div3
   fourcc DIV6,div6 div4
   fourcc DIV3,div3,DIV4,div3
-  driver dshow
-  dll "divx_c32.ax"
-  guid 0x82CCd3E0, 0xF71A, 0x11D0, 0x9f, 0xe5, 0x00, 0x60, 0x97, 0x78, 0xaa, 0xaa
-  out YUY2 noflip
-  out RGB32,RGB24,RGB16,RGB15 noflip
-
+  driver vfw
+  dll "divxc32.dll"
+  out YUY2 yuvhack
+  out BGR32,BGR24,BGR15
+  
 videocodec odivx
   info "OpenDivX (MPEG-4 v2)"
   fourcc DIVX,divx
   fourcc DIV1,div1 divx
   driver odivx
-  out YV12 noflip
+  out YV12
 
 videocodec indeo5
   info "Intel Indeo 5"
   fourcc IV50,iv50
   driver vfw
   dll "ir50_32.dll"
-  out YUY2 noflip
-  out RGB32,RGB24,RGB15 noflip
+  out YUY2
+  out BGR32,BGR24,BGR15
 
 videocodec indeo4
   info "Intel Indeo 4.1"
@@ -58,7 +64,7 @@ videocodec indeo4
   fourcc IV41,iv41
   driver vfw
   dll "ir41_32.dll"
-  out RGB24,RGB15 flip
+  out BGR24,BGR15 flip
 
 videocodec indeo3
   info "Intel Indeo 3.1/3.2"
@@ -67,30 +73,30 @@ videocodec indeo3
   fourcc IV32,iv32
   driver vfw
   dll "ir32_32.dll"
-  out RGB24,RGB15 flip
+  out BGR24,BGR15 flip
 
 videocodec cvid
   info "Cinepak Video"
   fourcc cvid
   driver vfw
   dll "msvidc32.dll"
-  out YUY2 noflip
-  out RGB24,RGB15 noflip
+  out YUY2
+  out BGR24,BGR15
 
 videocodec cram
   info "CRAM"
   fourcc cram,CRAM
   driver vfw
   dll "msvidc32.dll"
-  out RGB24,RGB15 noflip
+  out BGR24,BGR15
 
 videocodec vcr2
   info "ATI VCR-2"
   fourcc VCR2
   driver vfw
   dll "ativcr2.dll"
-  out YUY2 noflip
-  out RGB32,RGB24,RGB15 noflip
+  out YUY2
+  out BGR32,BGR24,BGR15
 
 videocodec i263
   info "I263"
@@ -98,7 +104,7 @@ videocodec i263
   fourcc I263,i263
   driver vfw
   dll "i263_32.drv"
-  out RGB32,RGB24,RGB15 noflip
+  out BGR32,BGR24,BGR15
 
 videocodec mjpeg
   info "Motion JPEG"
@@ -106,8 +112,8 @@ videocodec mjpeg
   driver vfw
   dll "mcmjpg32.dll"
 ;  dll "m3jpeg32.dll"
-  out YUY2 noflip
-  out RGB32,RGB24,RGB15 noflip
+  out YUY2
+  out BGR32,BGR24,BGR15
 
 videocodec wmv1
   info "Windows Media Video 7"
@@ -115,8 +121,8 @@ videocodec wmv1
   driver dshow
   dll "wmvds32.ax"
   guid 0x4facbba1, 0xffd8, 0x4cd7, 0x82, 0x28, 0x61, 0xe2, 0xf6, 0x5c, 0xb1, 0xae
-  out YUY2 noflip
-  out RGB32,RGB24,RGB16,RGB15 noflip
+  out YUY2
+  out BGR32,BGR24,BGR16,BGR15
 
 audiocodec divx
   info "DivX audio (WMA)"
@@ -166,6 +172,21 @@ audiocodec msgsm
   format 0x32
   driver msgsm
 
+audiocodec alaw
+  info "aLaw"
+  format 0x6
+  driver alaw
+
+audiocodec pcm
+  info "Uncompressed PCM"
+  format 0x1
+  driver pcm
+
+audiocodec ac3
+  info "AC3"
+  format 0x2000
+  driver libac3
+
 audiocodec voxware
   info "VoxWare"
   format 0x75