summaryrefslogtreecommitdiff
path: root/libav
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2002-06-18 09:12:54 +0000
committerMichael Niedermayer <michaelni@gmx.at>2002-06-18 09:12:54 +0000
commit9b030d9d73353b4a526ebfcf8828f39020c7a2aa (patch)
tree405b63075b1d2d238af2c4d6e5b05e67617bc7d2 /libav
parent0151a6f546121a5cd932fcaeef78e8f9f6f7582c (diff)
wmv1
Originally committed as revision 698 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libav')
-rw-r--r--libav/asf.c3
-rw-r--r--libav/avienc.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/libav/asf.c b/libav/asf.c
index 8dac626ebc..e1e49e3f3c 100644
--- a/libav/asf.c
+++ b/libav/asf.c
@@ -137,7 +137,8 @@ CodecTag codec_asf_bmp_tags[] = {
{ CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') }, /* default signature when using MSMPEG4 */
{ CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3') },
{ CODEC_ID_MSMPEG4V2, MKTAG('M', 'P', '4', '2') },
- { CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', '4', '1') },
+ { CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', 'G', '4') },
+ { CODEC_ID_WMV1, MKTAG('W', 'M', 'V', '1') },
{ 0, 0 },
};
diff --git a/libav/avienc.c b/libav/avienc.c
index 94e4be11d1..0539b54d2e 100644
--- a/libav/avienc.c
+++ b/libav/avienc.c
@@ -66,7 +66,8 @@ CodecTag codec_bmp_tags[] = {
{ CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3') }, /* default signature when using MSMPEG4 */
{ CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') },
{ CODEC_ID_MSMPEG4V2, MKTAG('M', 'P', '4', '2') },
- { CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', '4', '1') },
+ { CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', 'G', '4') },
+ { CODEC_ID_WMV1, MKTAG('W', 'M', 'V', '1') },
{ 0, 0 },
};