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

[reimar]

Author: reimar
Date: Sat Jul 10 09:57:06 2010
New Revision: 31656

Log:
Add/fix GSM audio decoding through FFmpeg.

Modified:
   trunk/etc/codecs.conf

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Sat Jul 10 09:25:44 2010	(r31655)
+++ trunk/etc/codecs.conf	Sat Jul 10 09:57:06 2010	(r31656)
@@ -4283,14 +4283,36 @@ audiocodec imaadpcmacm
   driver acm
   dll "imaadp32.acm"
 
-audiocodec libgsmms
-  info "libgsm MS GSM"
+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
-  fourcc agsm
+  driver ffmpeg
+  dll "libgsm"
+
+audiocodec libgsmms
+  info "libgsm MS GSM"
+  status working
+  format 0x31
+  format 0x32
   driver ffmpeg
   dll "libgsm_ms"