Mercurial > mplayer.hg

changeset 34042:89ad6c0928cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support act files with -demuxer lavf.
author cehoyos
date Sun, 25 Sep 2011 09:55:30 +0000
parents fa1844bcdbc6
children 94106ed224b3
files etc/codecs.conf libmpdemux/mp_taglists.c
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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')},