Mercurial > mplayer.hg

changeset 34079:eb8263a3b131

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support G.723.1 decoding via FFmpeg.
author cehoyos
date Fri, 30 Sep 2011 21:47:26 +0000
parents 0be10e21f6ac
children 0d4741369ee1
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 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
--- 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},