diff options
| author | compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-10-16 13:06:35 +0000 |
|---|---|---|
| committer | compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-10-16 13:06:35 +0000 |
| commit | 014b44de8e6befc19070845fb9bf0e202d9c0a3c (patch) | |
| tree | c80a8b7b0df60da9a396f28f79c13de5e41b820a | |
| parent | 39e5906704211082c8a00d4a30fd02e138c11c36 (diff) | |
| download | mpv-014b44de8e6befc19070845fb9bf0e202d9c0a3c.tar.bz2 mpv-014b44de8e6befc19070845fb9bf0e202d9c0a3c.tar.xz | |
add nellymoser codec to mplayer with internal fourcc NELL
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24792 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | etc/codecs.conf | 7 | ||||
| -rw-r--r-- | libmpdemux/demux_lavf.c | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 4e810b0412..e510b5d982 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -2747,6 +2747,13 @@ audiocodec ffape driver ffmpeg dll "ape" +audiocodec ffnellymoser + info "FFmpeg Nellymoser Audio decoder" + status working + fourcc "NELL" ; internal MPlayer FourCC + driver ffmpeg + dll "nellymoser" + audiocodec pcm info "Uncompressed PCM" status working diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 6ec11af57b..11a93e4f7a 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -86,6 +86,7 @@ static const AVCodecTag mp_wav_tags[] = { { CODEC_ID_DSICINAUDIO, MKTAG('D', 'C', 'I', 'A')}, { CODEC_ID_INTERPLAY_DPCM, MKTAG('I', 'N', 'P', 'A')}, { CODEC_ID_MUSEPACK7, MKTAG('M', 'P', 'C', ' ')}, + { CODEC_ID_NELLYMOSER, MKTAG('N', 'E', 'L', 'L')}, { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4')}, { CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's')}, { CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's')}, |