Mercurial > mplayer.hg

changeset 36383:12b7f66d1a47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support little endian G.726 as found in Sun au files.
author cehoyos
date Fri, 18 Oct 2013 18:03:21 +0000
parents d2ed641667d2
children e79bac50b920
files etc/codecs.conf libmpdemux/mp_taglists.c
diffstat 2 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Fri Oct 18 06:16:58 2013 +0000
+++ b/etc/codecs.conf	Fri Oct 18 18:03:21 2013 +0000
@@ -5907,6 +5907,13 @@
   driver ffmpeg
   dll "g726"
 
+audiocodec ffg726le
+  info "FFmpeg G.726 little endian Audio"
+  status working
+  fourcc 627G ; internal MPlayer FourCC
+  driver ffmpeg
+  dll g726le
+
 audiocodec g726
   info "Sharp G.726 Audio"
   status untested
--- a/libmpdemux/mp_taglists.c	Fri Oct 18 06:16:58 2013 +0000
+++ b/libmpdemux/mp_taglists.c	Fri Oct 18 18:03:21 2013 +0000
@@ -106,6 +106,9 @@
     { AV_CODEC_ID_ESCAPE130,         MKTAG('E', '1', '3', '0') },
 #endif
     { AV_CODEC_ID_FLV1,              MKTAG('F', 'L', 'V', '1') },
+#if LIBAVUTIL_VERSION_MICRO >= 100
+    { AV_CODEC_ID_ADPCM_G726LE,      MKTAG('6', '2', '7', 'G') },
+#endif
     { AV_CODEC_ID_G729,              MKTAG('G', '7', '2', '9') },
     { AV_CODEC_ID_H264,              MKTAG('H', '2', '6', '4') },
     { AV_CODEC_ID_MP3,               0x55 },