more mpeg4 fourcc's git-svn-id: file:///var/local/repositories/ffmpeg/trunk@701 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

6d3d0886 · michaelni · 4cd76dd5 · 6d3d0886 · 6d3d0886
Commit 6d3d0886 authored Jun 22, 2002 by michaelni
Show whitespace changes
Inline Side-by-side

Showing with 14 additions and 0 deletions

libav/asf.c libav/asf.c +7 -0

libav/avienc.c libav/avienc.c +7 -0

No files found.
--- a/libav/asf.c
+++ b/libav/asf.c
@@ -133,6 +133,13 @@ CodecTag codec_asf_bmp_tags[] = {
    { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') },
    { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') },
    { CODEC_ID_MPEG4, MKTAG('d', 'i', 'v', 'x') },
+    { CODEC_ID_MPEG4, MKTAG('D', 'X', '5', '0') },
+    { CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') },
+    { CODEC_ID_MPEG4, MKTAG('x', 'v', 'i', 'd') },
+    { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 's') },
+    { CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') },
+    { CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') },
+    { CODEC_ID_MPEG4, MKTAG('m', '4', 's', '2') },
    { CODEC_ID_MPEG4, MKTAG(0x04, 0, 0, 0) }, /* some broken avi use this */
    { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') }, /* default signature when using MSMPEG4 */ 
    { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3') },

--- a/libav/avienc.c
+++ b/libav/avienc.c
@@ -62,6 +62,13 @@ CodecTag codec_bmp_tags[] = {
    { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') },
    { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') },
    { CODEC_ID_MPEG4, MKTAG('d', 'i', 'v', 'x') },
+    { CODEC_ID_MPEG4, MKTAG('D', 'X', '5', '0') },
+    { CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') },
+    { CODEC_ID_MPEG4, MKTAG('x', 'v', 'i', 'd') },
+    { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 's') },
+    { CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') },
+    { CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') },
+    { CODEC_ID_MPEG4, MKTAG('m', '4', 's', '2') },
    { CODEC_ID_MPEG4, MKTAG(0x04, 0, 0, 0) }, /* some broken avi use this */
    { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3') }, /* default signature when using MSMPEG4 */
    { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') },