diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-06-22 23:08:37 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-06-22 23:08:37 +0000 |
| commit | 390dffc5ad72886292603f2715d73f6e591a6e49 (patch) | |
| tree | ca22a8a3256e20825bfb3a08814d6580a8b78bdd /libav | |
| parent | 44c1035c2f41543417180daa5262494d81f3f3f3 (diff) | |
| download | ffmpeg-390dffc5ad72886292603f2715d73f6e591a6e49.tar.gz | |
more mpeg4 fourcc's
Originally committed as revision 701 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libav')
| -rw-r--r-- | libav/asf.c | 7 | ||||
| -rw-r--r-- | libav/avienc.c | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/libav/asf.c b/libav/asf.c index e1e49e3f3c..2b0993262d 100644 --- 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') }, diff --git a/libav/avienc.c b/libav/avienc.c index 0539b54d2e..2ef9ef1823 100644 --- 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') }, |