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

[cehoyos]

Author: cehoyos
Date: Sun Sep 25 11:55:30 2011
New Revision: 34130

Log:
Support act files with -demuxer lavf.

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

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Sat Sep 24 01:41:33 2011	(r34129)
+++ trunk/etc/codecs.conf	Sun Sep 25 11:55:30 2011	(r34130)
@@ -5003,6 +5003,13 @@ audiocodec g726
   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

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Sat Sep 24 01:41:33 2011	(r34129)
+++ trunk/libmpdemux/mp_taglists.c	Sun Sep 25 11:55:30 2011	(r34130)
@@ -69,6 +69,7 @@ static const AVCodecTag mp_codecid_overr
     { 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')},