summaryrefslogtreecommitdiff
path: root/libavformat/riff.c
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2012-11-26 23:36:13 -0500
committerJustin Ruggles <justin.ruggles@gmail.com>2012-11-28 11:18:50 -0500
commit5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66 (patch)
treebeee7b3addff5767ca9caec57d1e27c46ebc6855 /libavformat/riff.c
parent261e9348ef377efc8672c6f8ade974cee7db8e49 (diff)
lavf: move nuv fourcc audio tags from riff to nuv
Diffstat (limited to 'libavformat/riff.c')
-rw-r--r--libavformat/riff.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 475486da82..79b2670481 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -343,11 +343,6 @@ const AVCodecTag ff_codec_wav_tags[] = {
{ AV_CODEC_ID_FLAC, 0xF1AC },
{ AV_CODEC_ID_ADPCM_SWF, ('S'<<8)+'F' },
{ AV_CODEC_ID_VORBIS, ('V'<<8)+'o' }, //HACK/FIXME, does vorbis in WAV/AVI have an (in)official id?
-
- /* FIXME: All of the IDs below are not 16 bit and thus illegal. */
- // for NuppelVideo (nuv.c)
- { AV_CODEC_ID_PCM_S16LE, MKTAG('R', 'A', 'W', 'A') },
- { AV_CODEC_ID_MP3, MKTAG('L', 'A', 'M', 'E') },
{ AV_CODEC_ID_NONE, 0 },
};