summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-07-03 20:54:54 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:14:20 +0200
commita874569db62bfe8fb134e248a12d2f3653f1c028 (patch)
tree419630c4f9748e80c4805179f3bcf77833627f00
parent63b69b312c8e89b19422b5e0bae02c80858e6f6e (diff)
downloadmpv-a874569db62bfe8fb134e248a12d2f3653f1c028.tar.bz2
mpv-a874569db62bfe8fb134e248a12d2f3653f1c028.tar.xz
codecs.conf: Support libgsm via libavcodec
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31629 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--etc/codecs.conf11
1 files changed, 11 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 7e912e3afd..bfb9b018f2 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -4283,6 +4283,17 @@ audiocodec imaadpcmacm
driver acm
dll "imaadp32.acm"
+audiocodec libgsmms
+ info "libgsm MS GSM"
+ status working
+ format 0x31
+ format 0x32
+ format 0x204D5347
+ format 0x1500
+ fourcc agsm
+ driver ffmpeg
+ dll "libgsm_ms"
+
audiocodec msgsm
info "MS GSM"
status working