summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorcompn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-11-28 05:32:00 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-12-16 05:05:41 +0200
commitf96ba3ad32addecd41e4af202d4acb09b81442ba (patch)
tree36655c83c183c7443828b1b73756f7a86f6f6697 /etc
parent0f1ca625de01cd16bd10dc021c9e6e15fe3d54bc (diff)
downloadmpv-f96ba3ad32addecd41e4af202d4acb09b81442ba.tar.bz2
mpv-f96ba3ad32addecd41e4af202d4acb09b81442ba.tar.xz
codecs.conf: add ffmpeg g722 audio codec
works on incoming/g722/ sample git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32662 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf7
1 files changed, 7 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index fe3f6d299d..5242f05f69 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -4714,6 +4714,13 @@ audiocodec g72x
driver g72x
dll "g72x.c"
+audiocodec ffg722
+ info "G.722 Audio"
+ status working
+ format 0x28F
+ driver ffmpeg
+ dll "g722"
+
audiocodec ffg726
info "Sharp G.726 Audio"
status working