[MPlayer-cvslog] r35044 - trunk/etc/codecs.conf

[compn]

Author: compn
Date: Sat Jul 21 13:08:14 2012
New Revision: 35044

Log:
fix previous commit, duplicated g7231 codec entry

Modified:
   trunk/etc/codecs.conf

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Sat Jul 21 13:05:43 2012	(r35043)
+++ trunk/etc/codecs.conf	Sat Jul 21 13:08:14 2012	(r35044)
@@ -5520,20 +5520,6 @@ audiocodec vivoaudio
   driver acm
   dll "vivog723.acm"
 
-audiocodec ffg7231
-  info "G.723.1 MS"
-  status working
-  format 0x42
-  driver ffmpeg
-  dll "g723_1"
-
-audiocodec g7231ms
-  info "G.723.1 MS"
-  status working
-  format 0x42
-  driver acm
-  dll "msg723.acm"
-
 audiocodec g72x
   info "G.711/G.721/G.723"
   status crashing
@@ -5554,9 +5540,17 @@ audiocodec ffg7231
   info "G.723.1 Audio"
   status working
   fourcc 7231 ; internal MPlayer FourCC
+  format 0x42
   driver ffmpeg
   dll "g723_1"
 
+audiocodec g7231ms
+  info "G.723.1 MS"
+  status working
+  format 0x42
+  driver acm
+  dll "msg723.acm"
+
 audiocodec ffg726
   info "Sharp G.726 Audio"
   status working