diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2010-09-29 21:35:52 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2010-09-29 21:35:52 +0000 |
| commit | 826481ea912f985dd5521e14baf0ed3e9a2bc0e4 (patch) | |
| tree | b26914130356ee65e5e888d8b34155b417bcfd9f | |
| parent | 3432c26319de1508d6371c427ce19f76863eefa0 (diff) | |
| download | ffmpeg-826481ea912f985dd5521e14baf0ed3e9a2bc0e4.tar.gz | |
Remove duplicate entries
Originally committed as revision 25264 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/isom.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index a568c4d76c..36d5b6d0bf 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -132,7 +132,6 @@ const AVCodecTag codec_movvideo_tags[] = { { CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', '1') }, /* Apple MPEG-1 Camcorder */ { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */ - { CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', '1') }, { CODEC_ID_MPEG2VIDEO, MKTAG('m', '2', 'v', '2') }, /* Apple MPEG-2 Camcorder */ { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '1') }, /* MPEG2 HDV 720p30 */ { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '2') }, /* MPEG2 HDV 1080i60 */ @@ -170,7 +169,6 @@ const AVCodecTag codec_movvideo_tags[] = { { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'e') }, /* XDCAM EX 1080p25 VBR */ { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'f') }, /* XDCAM EX 1080p30 VBR */ { CODEC_ID_MPEG2VIDEO, MKTAG('A', 'V', 'm', 'p') }, /* AVID IMX PAL */ - { CODEC_ID_MPEG2VIDEO, MKTAG('m', '2', 'v', '1') }, { CODEC_ID_JPEG2000, MKTAG('m', 'j', 'p', '2') }, /* JPEG 2000 produced by FCP */ |