[SCM] libav/experimental: fix msmpeg4v3 tag in asf
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:55:14 UTC 2013
The following commit has been merged in the experimental branch:
commit 5c1844ab563c8b82355d9f60b7589a561fd94f4f
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sun Jan 21 13:01:53 2007 +0000
fix msmpeg4v3 tag in asf
Originally committed as revision 7606 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/asf-enc.c b/libavformat/asf-enc.c
index ff85323..811b9da 100644
--- a/libavformat/asf-enc.c
+++ b/libavformat/asf-enc.c
@@ -190,7 +190,6 @@
static const AVCodecTag codec_asf_bmp_tags[] = {
{ CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') },
{ CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') },
- { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3') },
{ CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') },
{ CODEC_ID_NONE, 0 },
};
diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref
index 1e388d9..e1599c4 100644
--- a/tests/libav.regression.ref
+++ b/tests/libav.regression.ref
@@ -2,7 +2,7 @@ ffmpeg regression test
8a0536ccfe36f4fff408b3327d33e1dd *./data/b-libav.avi
340344 ./data/b-libav.avi
./data/b-libav.avi CRC=0x400c29e9
-85caa242a36abeab85a27c82ba73cc28 *./data/b-libav.asf
+a46c4f3fc33587cbb644363066281424 *./data/b-libav.asf
339767 ./data/b-libav.asf
./data/b-libav.asf CRC=0x74113749
1ad618e9fd318eb3483270cf9b9b3f43 *./data/b-libav.rm
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list