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

[cehoyos]

Author: cehoyos
Date: Fri Oct 18 20:03:21 2013
New Revision: 36479

Log:
Support little endian G.726 as found in Sun au files.

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

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Fri Oct 18 08:16:58 2013	(r36478)
+++ trunk/etc/codecs.conf	Fri Oct 18 20:03:21 2013	(r36479)
@@ -5907,6 +5907,13 @@ audiocodec ffg726
   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

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Fri Oct 18 08:16:58 2013	(r36478)
+++ trunk/libmpdemux/mp_taglists.c	Fri Oct 18 20:03:21 2013	(r36479)
@@ -106,6 +106,9 @@ static const struct AVCodecTag mp_codeci
     { 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 },