From 4d83c67b5c2a2b8d348a81013592470a17a0822d Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 10 Jul 2010 07:57:06 +0000
Subject: codecs.conf: Add/fix GSM audio decoding through FFmpeg

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31656 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 etc/codecs.conf | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

(limited to 'etc')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index bfb9b018f2..80f744267e 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -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"
 
-- 
cgit v1.2.3