Mercurial > mplayer.hg

diff etc/codecs.conf @ 31590:dd1dc0ff5283

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add/fix GSM audio decoding through FFmpeg.
author reimar
date Sat, 10 Jul 2010 07:57:06 +0000
parents 1474401afe45
children cc5e21203fb5
line wrap: on
line diff
--- a/etc/codecs.conf	Sat Jul 10 07:25:44 2010 +0000
+++ b/etc/codecs.conf	Sat Jul 10 07:57:06 2010 +0000
@@ -4283,14 +4283,36 @@
   driver acm
   dll "imaadp32.acm"
 
+audiocodec ffgsm
+  info "FFmpeg GSM 06.10"
+  status working
+  format 0x204D5347
+  format 0x1500
+  fourcc agsm
+  driver ffmpeg
+  dll "gsm"
+
+audiocodec ffgsmms
+  info "FFmpeg MS GSM"
+  status working
+  format 0x31
+  format 0x32
+  driver ffmpeg
+  dll "gsm_ms"
+
+audiocodec libgsm
+  info "libgsm GSM 06.10"
+  status working
+  format 0x204D5347
+  format 0x1500
+  driver ffmpeg
+  dll "libgsm"
+
 audiocodec libgsmms
   info "libgsm MS GSM"
   status working
   format 0x31
   format 0x32
-  format 0x204D5347
-  format 0x1500
-  fourcc agsm
   driver ffmpeg
   dll "libgsm_ms"