# HG changeset patch
# User cehoyos
# Date 1316944530 0
# Node ID 89ad6c0928cf85108fef2b4a20780acc162189c8
# Parent  fa1844bcdbc699dd38312f67a8910fdf781063f7
Support act files with -demuxer lavf.

diff -r fa1844bcdbc6 -r 89ad6c0928cf etc/codecs.conf
--- a/etc/codecs.conf	Fri Sep 23 23:41:33 2011 +0000
+++ b/etc/codecs.conf	Sun Sep 25 09:55:30 2011 +0000
@@ -5003,6 +5003,13 @@
   driver acm
   dll "scg726.acm"
 
+audiocodec ffg729
+  info "FFmpeg G.729"
+  status working
+  fourcc G729 ; internal MPlayer FourCC
+  driver ffmpeg
+  dll "g729"
+
 audiocodec atrac3
   info "Sony ATRAC3"
   status buggy
diff -r fa1844bcdbc6 -r 89ad6c0928cf libmpdemux/mp_taglists.c
--- a/libmpdemux/mp_taglists.c	Fri Sep 23 23:41:33 2011 +0000
+++ b/libmpdemux/mp_taglists.c	Sun Sep 25 09:55:30 2011 +0000
@@ -69,6 +69,7 @@
     { CODEC_ID_DTS,               0x2001},
     { CODEC_ID_DVVIDEO,           MKTAG('d', 'v', 's', 'd')},
     { CODEC_ID_EAC3,              MKTAG('E', 'A', 'C', '3')},
+    { CODEC_ID_G729,              MKTAG('G', '7', '2', '9')},
     { CODEC_ID_H264,              MKTAG('H', '2', '6', '4')},
     { CODEC_ID_MPEG4,             MKTAG('M', 'P', '4', 'V')},
     { CODEC_ID_PCM_BLURAY,        MKTAG('B', 'P', 'C', 'M')},