aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2006-08-09 12:11:32 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2006-08-09 12:11:32 +0000
commitb361ba2a4596adbfac87a2411053ac754b1fbc9f (patch)
treeb6c5e5b654f6cf54d1777fcd3c10b9fc0f3617f0 /libavformat
parent61e3dd7865154a79045a74241593ac9163a561e3 (diff)
downloadffmpeg-b361ba2a4596adbfac87a2411053ac754b1fbc9f.tar.gz
fourcc cleanup
Originally committed as revision 5969 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mov.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index bc87e1dd2a..84a5b67228 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -93,7 +93,6 @@ static const CodecTag mov_video_tags[] = {
{ CODEC_ID_H263, MKTAG('s', '2', '6', '3') }, /* H263 ?? works */
{ CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') }, /* DV NTSC */
{ CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 'p') }, /* DV PAL */
-/* { CODEC_ID_DVVIDEO, MKTAG('A', 'V', 'd', 'v') }, *//* AVID dv */
{ CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') }, /* On2 VP3 */
{ CODEC_ID_RPZA, MKTAG('r', 'p', 'z', 'a') }, /* Apple Video (RPZA) */
{ CODEC_ID_CINEPAK, MKTAG('c', 'v', 'i', 'd') }, /* Cinepak */
@@ -124,7 +123,6 @@ static const CodecTag mov_audio_tags[] = {
{ CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4') },
{ CODEC_ID_PCM_S16BE, MKTAG('N', 'O', 'N', 'E') }, /* uncompressed */
{ CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's') }, /* 16 bits */
- /* { CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's') },*/ /* 8 bits */
{ CODEC_ID_PCM_U8, MKTAG('r', 'a', 'w', ' ') }, /* 8 bits unsigned */
{ CODEC_ID_PCM_S16LE, MKTAG('s', 'o', 'w', 't') }, /* */
{ CODEC_ID_PCM_MULAW, MKTAG('u', 'l', 'a', 'w') }, /* */