wide atom is only defined in mov, use free for mp4/3gp

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

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index de6c760..b63e828 100644 (file)
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1332,7 +1332,7 @@ static int mov_write_moov_tag(ByteIOContext *pb, MOVContext *mov,
 static int mov_write_mdat_tag(ByteIOContext *pb, MOVContext* mov)
 {
     put_be32(pb, 8);    // placeholder for extended size field (64 bit)
-    put_tag(pb, "wide");
+    put_tag(pb, mov->mode == MODE_MOV ? "wide" : "free");
 
     mov->mdat_pos = url_ftell(pb);
     put_be32(pb, 0); /* size placeholder*/

diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref
index cc44375..5958ae2 100644 (file)
--- a/tests/ffmpeg.regression.ref
+++ b/tests/ffmpeg.regression.ref
@@ -59,7 +59,7 @@ stddev:  8.08 PSNR:29.97 bytes:7602176
 2415378 ./data/a-h263p.avi
 28fd12ac0b168252d81df6f6e60a5d17 *./data/out.yuv
 stddev:  2.07 PSNR:41.76 bytes:7602176
-0ff2951f72be3e62038b426f0ec12e1b *./data/a-odivx.mp4
+d84b65558cd386064ab7a126d66c4744 *./data/a-odivx.mp4
 554499 ./data/a-odivx.mp4
 57aed19df5cbada4b05991527ee72ebe *./data/out.yuv
 stddev:  7.99 PSNR:30.06 bytes:7602176
@@ -83,7 +83,7 @@ stddev: 12.32 PSNR:26.31 bytes:7602176
 900488 ./data/a-mpeg4-Q.avi
 af59c063ed644c7dc4151a0a2debbddd *./data/out.yuv
 stddev:  5.69 PSNR:33.00 bytes:7602176
-2ff870bf5e75d493072cc28ea8d51ab1 *./data/a-mpeg4-PSP.mp4
+b8da412bd5421c6ac6fcb6c9caa261ae *./data/a-mpeg4-PSP.mp4
 407313 ./data/a-mpeg4-PSP.mp4
 ef45e577219460332bed428106f638a6 *./data/a-error-mpeg4-adv.avi
 767718 ./data/a-error-mpeg4-adv.avi

diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref
index 41209b5..3af0b93 100644 (file)
--- a/tests/rotozoom.regression.ref
+++ b/tests/rotozoom.regression.ref
@@ -59,7 +59,7 @@ stddev:  5.44 PSNR:33.41 bytes:7602176
 869200 ./data/a-h263p.avi
 80fb224bebbe2e04f228da7485b905c5 *./data/out.yuv
 stddev:  1.91 PSNR:42.49 bytes:7602176
-58ca40c205c596abbd770ceb221df3ec *./data/a-odivx.mp4
+286c5a5fca0d3e17ba6ede970b8318b8 *./data/a-odivx.mp4
 120150 ./data/a-odivx.mp4
 e8c90899c32e11e7e4d1354dab0b8f28 *./data/out.yuv
 stddev:  5.34 PSNR:33.56 bytes:7602176
@@ -83,7 +83,7 @@ stddev:  4.04 PSNR:35.98 bytes:7602176
 166034 ./data/a-mpeg4-Q.avi
 b078f22c66083f0537bd3581509684d8 *./data/out.yuv
 stddev:  4.01 PSNR:36.05 bytes:7602176
-30fa98177dad6bd40a1baf13c29c20d4 *./data/a-mpeg4-PSP.mp4
+29bdd2038570dc612f19eacfc4f9011a *./data/a-mpeg4-PSP.mp4
 321886 ./data/a-mpeg4-PSP.mp4
 d93e3d53110437db55e954a14fdd7c3a *./data/a-error-mpeg4-adv.avi
 178248 ./data/a-error-mpeg4-adv.avi