Mercurial > mplayer.hg

diff etc/codecs.conf @ 34950:7d84339b35b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix previous commit, duplicated g7231 codec entry
author compn
date Sat, 21 Jul 2012 11:08:14 +0000
parents f43323b9b020
children 75c3f928afdd
line wrap: on
line diff
--- a/etc/codecs.conf	Sat Jul 21 11:05:43 2012 +0000
+++ b/etc/codecs.conf	Sat Jul 21 11:08:14 2012 +0000
@@ -5520,20 +5520,6 @@
   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 @@
   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