[MPlayer-cvslog] r34167 - in trunk: etc/codecs.conf libmpdemux/mp_taglists.c

[cehoyos]

Author: cehoyos
Date: Fri Sep 30 23:47:26 2011
New Revision: 34167

Log:
Support G.723.1 decoding via FFmpeg.

Modified:
   trunk/etc/codecs.conf
   trunk/libmpdemux/mp_taglists.c

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Fri Sep 30 23:20:07 2011	(r34166)
+++ trunk/etc/codecs.conf	Fri Sep 30 23:47:26 2011	(r34167)
@@ -5042,6 +5042,13 @@ audiocodec ffg722
   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

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Fri Sep 30 23:20:07 2011	(r34166)
+++ trunk/libmpdemux/mp_taglists.c	Fri Sep 30 23:47:26 2011	(r34167)
@@ -36,6 +36,7 @@ static const AVCodecTag mp_wav_tags[] = 
     { 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},