switch MPEG4 fourcc to FMP4

Originally committed as revision 3972 to svn://svn.ffmpeg.org/ffmpeg/trunk

4 files changed, 15 insertions, 14 deletions

diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index 2dbde07e60..8ecff24caf 100644
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -87,6 +87,7 @@ const CodecTag codec_bmp_tags[] = {
     { CODEC_ID_H263P, MKTAG('U', '2', '6', '3') },
     { CODEC_ID_H263P, MKTAG('v', 'i', 'v', '1') },
 
+    { CODEC_ID_MPEG4, MKTAG('F', 'M', 'P', '4')},
     { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X'), .invalid_asf = 1 },
     { CODEC_ID_MPEG4, MKTAG('D', 'X', '5', '0'), .invalid_asf = 1 },
     { CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D'), .invalid_asf = 1 },
diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref
index c3913bfa0b..945262c7b2 100644
--- a/tests/ffmpeg.regression.ref
+++ b/tests/ffmpeg.regression.ref
@@ -59,27 +59,27 @@ b415b4d46c0c693d973dd45b1898de52 *./data/a-huffyuv.avi
 7932708 ./data/a-huffyuv.avi
 799d3db687f6cdd7a837ec156efc171f *./data/out.yuv
 stddev:  0.00 PSNR:99.99 bytes:7602176
-788092f090eb1b11b78369f83e430fba *./data/a-mpeg4-rc.avi
+d41e47df8f3fc5a5637ae131bec73357 *./data/a-mpeg4-rc.avi
 820964 ./data/a-mpeg4-rc.avi
 8458b4ddaca643a3ec1264c1ee2f4986 *./data/out.yuv
 stddev: 10.41 PSNR:27.77 bytes:7602176
-7aab4613f634d23b6c66eec7270baaff *./data/a-mpeg4-adv.avi
+560b3f13ee58a5b2aa06800c52f8369b *./data/a-mpeg4-adv.avi
 600240 ./data/a-mpeg4-adv.avi
 0b7935cee2070f3b838478cea6dc4b3c *./data/out.yuv
 stddev: 10.25 PSNR:27.90 bytes:7602176
-0000cc8c66f88d0e25ecdd63e85e457a *./data/a-mpeg4-thread.avi
+9b788dd09a63c61f71f098cc1fd77667 *./data/a-mpeg4-thread.avi
 756550 ./data/a-mpeg4-thread.avi
 7e4e2cf2659aa158f5ffed2be45a9c3d *./data/out.yuv
 stddev: 12.31 PSNR:26.31 bytes:7602176
-545245d3169814f03dad599cac4b9ada *./data/a-mpeg4-Q.avi
+d8fba962b145ef47f346db63dbfcd04c *./data/a-mpeg4-Q.avi
 899514 ./data/a-mpeg4-Q.avi
 cdb77818e108eab89c9ac4bcaf350e19 *./data/out.yuv
 stddev:  5.69 PSNR:33.00 bytes:7602176
-f28aea7181f680687ea9522f0066d18a *./data/a-error-mpeg4-adv.avi
+8a9af311aada1d907ab39fefe7b60362 *./data/a-error-mpeg4-adv.avi
 750788 ./data/a-error-mpeg4-adv.avi
 83c96db61822c4ee2b9d46f1055264c5 *./data/out.yuv
 stddev: 17.22 PSNR:23.40 bytes:7602176
-cc818f4e46e0ea2f93d61e0c7f83ebed *./data/a-mpeg4-nr.avi
+9a844a09f0c58b8770b70c3eaad32e3d *./data/a-mpeg4-nr.avi
 689772 ./data/a-mpeg4-nr.avi
 79f4e8263e40822c0cbf35725f375b24 *./data/out.yuv
 stddev:  7.03 PSNR:31.18 bytes:7602176
diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref
index 020ea16f4d..c1aef185ae 100644
--- a/tests/libav.regression.ref
+++ b/tests/libav.regression.ref
@@ -1,5 +1,5 @@
 ffmpeg regression test
-8517e7c83227074b8d632477fda310d5 *./data/b-libav.avi
+d86f2c98dfa2c410c98b4eb9c88be2b2 *./data/b-libav.avi
 342282 ./data/b-libav.avi
 ./data/b-libav.avi CRC=ccab3a27
 c83444a0e8ef47b6af1d868d1bb21696 *./data/b-libav.asf
@@ -22,7 +22,7 @@ c83444a0e8ef47b6af1d868d1bb21696 *./data/b-libav.asf
 832a73bbf39055a70ceb50a396cb3051 *./data/b-libav.mov
 369865 ./data/b-libav.mov
 ./data/b-libav.mov CRC=48f5a90d
-fea20ced22451312dd463110e594eda6 *./data/b-libav.nut
+f34e560f8f0f2c603cf0cb3e7eeb031b *./data/b-libav.nut
 332415 ./data/b-libav.nut
 ./data/b-libav.nut CRC=ccab3a27
 29a2c312bbc5b187491183a918556475 *./data/b-libav.dv
diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref
index 279ab73b94..b040c5b7ea 100644
--- a/tests/rotozoom.regression.ref
+++ b/tests/rotozoom.regression.ref
@@ -59,27 +59,27 @@ eb6a67c8bc0df5dd1bef308e776fe193 *./data/a-huffyuv.avi
 6454196 ./data/a-huffyuv.avi
 dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv
 stddev:  0.00 PSNR:99.99 bytes:7602176
-e9ce342786f760b8e0a62a8fb2601628 *./data/a-mpeg4-rc.avi
+7de34451360350e522c13423b96e5026 *./data/a-mpeg4-rc.avi
 228094 ./data/a-mpeg4-rc.avi
 764d5da4f1c8eda9bd554179ed1ea283 *./data/out.yuv
 stddev:  4.26 PSNR:35.51 bytes:7602176
-f5e3b1dc7fbfe47fd1354cb620825000 *./data/a-mpeg4-adv.avi
+da7f358a53317d2cae88bcb10a5bf9df *./data/a-mpeg4-adv.avi
 172538 ./data/a-mpeg4-adv.avi
 49fecc1105d25ff1c2fc9c0d4cb821b0 *./data/out.yuv
 stddev:  4.84 PSNR:34.41 bytes:7602176
-525aee25f7aed5566ac2a887190cda93 *./data/a-mpeg4-thread.avi
+c3159291727b7aa37913f8962ce941e1 *./data/a-mpeg4-thread.avi
 253098 ./data/a-mpeg4-thread.avi
 da1a5a3301ad2bdf5806a51ffa74d4fb *./data/out.yuv
 stddev:  4.06 PSNR:35.93 bytes:7602176
-79204f01954362d779e1e078365d3c31 *./data/a-mpeg4-Q.avi
+0961493eb3cfc37d62e3206e56143113 *./data/a-mpeg4-Q.avi
 165016 ./data/a-mpeg4-Q.avi
 94d8bd3897ac20bb3bef9cf384f9abd0 *./data/out.yuv
 stddev:  4.01 PSNR:36.05 bytes:7602176
-24f27c7781eb2d4f644f031d3f852686 *./data/a-error-mpeg4-adv.avi
+e03781f2ff74529cb4bd2af27a9ff961 *./data/a-error-mpeg4-adv.avi
 175778 ./data/a-error-mpeg4-adv.avi
 62106b2ae4c1cfc985face2dadb90cbc *./data/out.yuv
 stddev: 10.05 PSNR:28.08 bytes:7602176
-ae0d93b0d0f34403aac369f9fcfc522b *./data/a-mpeg4-nr.avi
+e9c50d0b5ff0b9edbd3049943124fa49 *./data/a-mpeg4-nr.avi
 154392 ./data/a-mpeg4-nr.avi
 33a6f702049ef4e074c6266b9d17d3e9 *./data/out.yuv
 stddev:  4.73 PSNR:34.61 bytes:7602176