From ff4897b64ad20bc1efd4d97eea181315a77e0ca4 Mon Sep 17 00:00:00 2001
From: arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 8 May 2001 21:25:42 +0000
Subject: mp3lib is primary again, libmpeg2 fourcc fixed

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@730 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 DOCS/codecs.conf | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'DOCS')

diff --git a/DOCS/codecs.conf b/DOCS/codecs.conf
index cdd5adaa51..fcad1c0c90 100644
--- a/DOCS/codecs.conf
+++ b/DOCS/codecs.conf
@@ -9,7 +9,7 @@ videocodec mpeg12
   comment "with postprocessing"
   status working
   format 0x1
-  format 0xFFFFFF01
+  format 0x10000001
   driver libmpeg2
   dll "libmpeg2"
   out YV12
@@ -225,8 +225,8 @@ videocodec huffyuv
   fourcc HFYU
   driver vfw
   dll "huffyuv.dll"
-  out YUY2
-  out UYVY
+;  out YUY2
+;  out UYVY
   out BGR32,BGR24,BGR15
 
 videocodec mszh
@@ -310,16 +310,7 @@ audiocodec msadpcm
   driver acm
   dll "msadp32.acm"
 
-; 3DNow! autodetection?
-audiocodec mp3acm
-  info "MPEG layer-3"
-  status working
-  comment "Optimized to Intel MMX/SSE, conflicts with security kernel patches"
-  format 0x55
-  driver acm
-  dll "l3codeca.acm"
-  flags seekable
-
+; now mp3lib is stable enough!?
 audiocodec mp3
   info "MPEG layer-2, layer-3"
   status working
@@ -330,6 +321,15 @@ audiocodec mp3
   dll "mp3lib (mpg123)"
   flags seekable
 
+audiocodec mp3acm
+  info "MPEG layer-3"
+  status working
+  comment "Optimized to Intel MMX/SSE, conflicts with security kernel patches"
+  format 0x55
+  driver acm
+  dll "l3codeca.acm"
+  flags seekable
+
 audiocodec imaadpcm
   info "IMA ADPCM"
   status working
-- 
cgit v1.2.3