# HG changeset patch
# User cehoyos
# Date 1317419246 0
# Node ID eb8263a3b13110896d5578030b8c2d14a8204434
# Parent  0be10e21f6ac96810da80b0b1b8ffa11cf8e5eca
Support G.723.1 decoding via FFmpeg.

diff -r 0be10e21f6ac -r eb8263a3b131 etc/codecs.conf
--- a/etc/codecs.conf	Fri Sep 30 21:20:07 2011 +0000
+++ b/etc/codecs.conf	Fri Sep 30 21:47:26 2011 +0000
@@ -5042,6 +5042,13 @@
   driver ffmpeg
   dll "g722"
 
+audiocodec ffg7231
+  info "G.723.1 Audio"
+  status working
+  fourcc 7231 ; internal MPlayer FourCC
+  driver ffmpeg
+  dll "g723_1"
+
 audiocodec ffg726
   info "Sharp G.726 Audio"
   status working
diff -r 0be10e21f6ac -r eb8263a3b131 libmpdemux/mp_taglists.c
--- a/libmpdemux/mp_taglists.c	Fri Sep 30 21:20:07 2011 +0000
+++ b/libmpdemux/mp_taglists.c	Fri Sep 30 21:47:26 2011 +0000
@@ -36,6 +36,7 @@
     { CODEC_ID_COOK,              MKTAG('c', 'o', 'o', 'k')},
     { CODEC_ID_DSICINAUDIO,       MKTAG('D', 'C', 'I', 'A')},
     { CODEC_ID_EAC3,              MKTAG('E', 'A', 'C', '3')},
+    { CODEC_ID_G723_1,            MKTAG('7', '2', '3', '1')},
     { CODEC_ID_INTERPLAY_DPCM,    MKTAG('I', 'N', 'P', 'A')},
     { CODEC_ID_MLP,               MKTAG('M', 'L', 'P', ' ')},
     { CODEC_ID_MP1,               0x50},