From 46586160bd6f0d56c92c4e3d7df307bbfb202caf Mon Sep 17 00:00:00 2001
From: arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 11 Oct 2001 14:46:09 +0000
Subject: dshow codec is preferred for mp42 - it does postprocess

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2166 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 etc/codecs.conf | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/etc/codecs.conf b/etc/codecs.conf
index 8cb10b816b..ff6ab376fd 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -47,22 +47,10 @@ videocodec mpeg12
   dll "libmpeg2"
   out YV12
 
-videocodec mpeg4
-  info "Microsoft MPEG-4 v1/v2"
-  status working
-;  comment "No postprocessing"
-  fourcc MPG4,mpg4
-  fourcc MP42,mp42
-  fourcc DIV2 mp42
-  driver vfw
-  dll "mpg4c32.dll"
-  out YUY2 yuvhack
-  out BGR32,BGR24,BGR15
-
 videocodec mpeg4ds
   info "Microsoft MPEG-4 v1/v2"
   status working
-;  comment "with postprocessing"
+  comment "with postprocessing"
   fourcc DIV2,div2 mp42
   fourcc MPG4,mpg4
   fourcc MP42,mp42
@@ -72,6 +60,18 @@ videocodec mpeg4ds
   out YUY2
   out BGR32,BGR24,BGR16,BGR15
 
+videocodec mpeg4
+  info "Microsoft MPEG-4 v1/v2"
+  status working
+;  comment "No postprocessing"
+  fourcc MPG4,mpg4
+  fourcc MP42,mp42
+  fourcc DIV2 mp42
+  driver vfw
+  dll "mpg4c32.dll"
+  out YUY2 yuvhack
+  out BGR32,BGR24,BGR15
+
 videocodec divx
   info "DivX ;-) (MS MPEG-4 v3)"
   status working
@@ -540,7 +540,8 @@ audiocodec msgsmacm
   format 0x31
   format 0x32
   driver acm
-  dll "msgsm32.acm"
+  dll "msnaudio.acm"
+;  dll "msgsm32.acm"
 
 audiocodec msgsm
   info "MS GSM"
-- 
cgit v1.2.3