I think we are also compliant to iso2.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@13765 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index bd84f9be06d39cbdbc4f958b15aa6c76dc1b3421..cb022a626e8b7fc46dc3e88024cd3cdfe9fb602b 100644 (file)
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1406,6 +1406,7 @@ static void mov_write_ftyp_tag(ByteIOContext *pb, AVFormatContext *s)
 
     if(mov->mode != MODE_MOV){
         put_tag(pb, "isom");
+        put_tag(pb, "iso2");
     }
 
     if (mov->mode == MODE_3GP)

diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref
index 609c6ec34a544dcff193b02bd95d54116e2cfe40..75f51af4264aff0a415964f9de18d93e26bf8864 100644 (file)
--- a/tests/ffmpeg.regression.ref
+++ b/tests/ffmpeg.regression.ref
@@ -58,8 +58,8 @@ e9e884a7c6b77d1aeeb4cb56ac150f92 *./tests/data/a-h263p.avi
 2389564 ./tests/data/a-h263p.avi
 0bb16a352798c997cb36e167f4fa8f3c *./tests/data/h263p.vsynth.out.yuv
 stddev:  2.07 PSNR:41.77 bytes:7602176
-520a3f041c5edf57183e7c5a8b902cc4 *./tests/data/a-odivx.mp4
-550783 ./tests/data/a-odivx.mp4
+df90a4c50f47577d8fc83a0184499266 *./tests/data/a-odivx.mp4
+550787 ./tests/data/a-odivx.mp4
 a1c691f3be526ecbf3be3152d5bab88c *./tests/data/mpeg4.vsynth.out.yuv
 stddev:  7.99 PSNR:30.06 bytes:7602176
 6c58e5707afe056b072d2ce21b3b8e4f *./tests/data/a-huffyuv.avi

diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref
index 47573d470f84efa430f19386540a3c3efa918e0d..054145a6b6229862a8a76d2e3750cf802fab3f0e 100644 (file)
--- a/tests/rotozoom.regression.ref
+++ b/tests/rotozoom.regression.ref
@@ -58,8 +58,8 @@ c7644d40e9f40bbd98e5a978f9f94bb4 *./tests/data/a-h263p.avi
 868018 ./tests/data/a-h263p.avi
 4b0ee791f280029dc03c528f76f195d4 *./tests/data/h263p.rotozoom.out.yuv
 stddev:  1.91 PSNR:42.49 bytes:7602176
-d173ea6adf8cd942483596cee3b68cc0 *./tests/data/a-odivx.mp4
-119793 ./tests/data/a-odivx.mp4
+1392b035d1db775c33b4fb90c7b70fa3 *./tests/data/a-odivx.mp4
+119797 ./tests/data/a-odivx.mp4
 90a3577850239083a9042bef33c50e85 *./tests/data/mpeg4.rotozoom.out.yuv
 stddev:  5.34 PSNR:33.56 bytes:7602176
 a1323da0c8b437cd6961f8c90451880b *./tests/data/a-huffyuv.avi

diff --git a/tests/seek.regression.ref b/tests/seek.regression.ref
index 8cc362faa1fe9bed882f380037e77026d6dd012b..657f86cf8b713474dbbb005d0f0087fd94cd0ea8 100644 (file)
--- a/tests/seek.regression.ref
+++ b/tests/seek.regression.ref
@@ -2001,51 +2001,51 @@ ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:29782 size:8869 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
 tests/data/a-odivx.mp4
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:40 size:8719 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:44 size:8719 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:40 size:8719 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:44 size:8719 flags:1
 ret: 0 st:-1 ts:1.894167 flags:1
-ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:75136 size:10776 flags:1
+ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:75140 size:10776 flags:1
 ret: 0 st: 0 ts:0.800000 flags:0
-ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:47224 size:9634 flags:1
+ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:47228 size:9634 flags:1
 ret:-1 st: 0 ts:-0.320000 flags:1
 ret:-1 st:-1 ts:2.576668 flags:0
 ret: 0 st:-1 ts:1.470835 flags:1
-ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:75136 size:10776 flags:1
+ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:75140 size:10776 flags:1
 ret: 0 st: 0 ts:0.360000 flags:0
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:23267 size:8524 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:23271 size:8524 flags:1
 ret:-1 st: 0 ts:-0.760000 flags:1
 ret:-1 st:-1 ts:2.153336 flags:0
 ret: 0 st:-1 ts:1.047503 flags:1
-ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:47224 size:9634 flags:1
+ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:47228 size:9634 flags:1
 ret: 0 st: 0 ts:-0.040000 flags:0
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:40 size:8719 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:44 size:8719 flags:1
 ret: 0 st: 0 ts:2.840000 flags:1
-ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:106163 size:11182 flags:1
+ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:106167 size:11182 flags:1
 ret: 0 st:-1 ts:1.730004 flags:0
-ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:106163 size:11182 flags:1
+ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:106167 size:11182 flags:1
 ret: 0 st:-1 ts:0.624171 flags:1
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:23267 size:8524 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:23271 size:8524 flags:1
 ret: 0 st: 0 ts:-0.480000 flags:0
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:40 size:8719 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:44 size:8719 flags:1
 ret: 0 st: 0 ts:2.400000 flags:1
-ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:106163 size:11182 flags:1
+ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:106167 size:11182 flags:1
 ret: 0 st:-1 ts:1.306672 flags:0
-ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:75136 size:10776 flags:1
+ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:75140 size:10776 flags:1
 ret: 0 st:-1 ts:0.200839 flags:1
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:40 size:8719 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:44 size:8719 flags:1
 ret: 0 st: 0 ts:-0.920000 flags:0
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:40 size:8719 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:44 size:8719 flags:1
 ret: 0 st: 0 ts:2.000000 flags:1
-ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:106163 size:11182 flags:1
+ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:106167 size:11182 flags:1
 ret: 0 st:-1 ts:0.883340 flags:0
-ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:47224 size:9634 flags:1
+ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:47228 size:9634 flags:1
 ret:-1 st:-1 ts:-0.222493 flags:1
 ret:-1 st: 0 ts:2.680000 flags:0
 ret: 0 st: 0 ts:1.560000 flags:1
-ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:75136 size:10776 flags:1
+ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:75140 size:10776 flags:1
 ret: 0 st:-1 ts:0.460008 flags:0
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:23267 size:8524 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:23271 size:8524 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
 tests/data/a-rv10.rm