diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-16 21:54:50 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-16 21:54:50 +0000 |
| commit | 20b2f493bb061cbb51b32ecc4f75bc29c3f7f15f (patch) | |
| tree | b4d7d8b5a8aacd1bc7f27576bbc7d172c008e9f4 | |
| parent | 50973f0044fb27d7b8b181316bc1f3fb39e010e3 (diff) | |
| download | mpv-20b2f493bb061cbb51b32ecc4f75bc29c3f7f15f.tar.bz2 mpv-20b2f493bb061cbb51b32ecc4f75bc29c3f7f15f.tar.xz | |
Support FFmpeg's ALS decoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30604 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | etc/codecs.conf | 7 | ||||
| -rw-r--r-- | libmpdemux/mp_taglists.c | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 26a052911e..8443202e0b 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -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 diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c index 50b87e8377..15beaf3916 100644 --- a/libmpdemux/mp_taglists.c +++ b/libmpdemux/mp_taglists.c @@ -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')}, |