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

[reimar]

Author: reimar
Date: Tue Feb 16 22:54:50 2010
New Revision: 30604

Log:
Support FFmpeg's ALS decoder.

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

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Tue Feb 16 20:39:30 2010	(r30603)
+++ trunk/etc/codecs.conf	Tue Feb 16 22:54:50 2010	(r30604)
@@ -3925,6 +3925,13 @@ audiocodec ffape
   driver ffmpeg
   dll "ape"
 
+audiocodec ffals
+  info "FFmpeg ALS"
+  status working
+  fourcc "ALS "
+  driver ffmpeg
+  dll "als"
+
 audiocodec ffmlp
   info "FFmpeg MLP"
   status working

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Tue Feb 16 20:39:30 2010	(r30603)
+++ trunk/libmpdemux/mp_taglists.c	Tue Feb 16 22:54:50 2010	(r30604)
@@ -36,6 +36,7 @@ static const AVCodecTag mp_wav_tags[] = 
     { CODEC_ID_INTERPLAY_DPCM,    MKTAG('I', 'N', 'P', 'A')},
     { CODEC_ID_MLP,               MKTAG('M', 'L', 'P', ' ')},
     { CODEC_ID_MP1,               0x50},
+    { CODEC_ID_MP4ALS,            MKTAG('A', 'L', 'S', ' ')},
     { CODEC_ID_MUSEPACK7,         MKTAG('M', 'P', 'C', ' ')},
     { CODEC_ID_MUSEPACK8,         MKTAG('M', 'P', 'C', '8')},
     { CODEC_ID_NELLYMOSER,        MKTAG('N', 'E', 'L', 'L')},