diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-07-07 12:17:46 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-07-07 12:17:46 +0000 |
| commit | a77608b67a00f2e584c5e08da13c81c9e7027f18 (patch) | |
| tree | 052e2e72de7b6d4081d38d12eb9482676a2e2bbd | |
| parent | 6ab83c724cfa66790fb88db89ee73cb05430462f (diff) | |
| download | mpv-a77608b67a00f2e584c5e08da13c81c9e7027f18.tar.bz2 mpv-a77608b67a00f2e584c5e08da13c81c9e7027f18.tar.xz | |
Add support for MLP audio through FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27232 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 64f8706815..f6ad1812bd 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -2912,6 +2912,13 @@ audiocodec ffape driver ffmpeg dll "ape" +audiocodec ffmlp + info "FFmpeg MLP decoder" + status working + fourcc "MLP " ; internal MPlayer FourCC + driver ffmpeg + dll "mlp" + audiocodec ffnellymoser info "FFmpeg Nellymoser Audio decoder" status working diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c index 4fcc95d6bd..39e8b76d92 100644 --- a/libmpdemux/mp_taglists.c +++ b/libmpdemux/mp_taglists.c @@ -32,6 +32,7 @@ static const AVCodecTag mp_wav_tags[] = { { CODEC_ID_COOK, MKTAG('c', 'o', 'o', 'k')}, { CODEC_ID_DSICINAUDIO, MKTAG('D', 'C', 'I', 'A')}, { CODEC_ID_INTERPLAY_DPCM, MKTAG('I', 'N', 'P', 'A')}, + { CODEC_ID_MLP, MKTAG('M', 'L', 'P', ' ')}, { CODEC_ID_MUSEPACK7, MKTAG('M', 'P', 'C', ' ')}, { CODEC_ID_MUSEPACK8, MKTAG('M', 'P', 'C', '8')}, { CODEC_ID_NELLYMOSER, MKTAG('N', 'E', 'L', 'L')}, |