diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2008-06-13 16:19:01 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2008-06-13 16:19:01 +0400 |
commit | ed6e47c21d4a419c986e249dc87e253177bba754 (patch) | |
tree | e12fa6307a299710b6f82eff5d805487fceed6a7 | |
parent | 1560b667143c321d1baaa784e4cfe9f01bd796b6 (diff) |
Add isom to the compatible brands.
Originally committed as revision 13764 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavformat/movenc.c | 8 | ||||
-rw-r--r-- | tests/ffmpeg.regression.ref | 4 | ||||
-rw-r--r-- | tests/rotozoom.regression.ref | 4 | ||||
-rw-r--r-- | tests/seek.regression.ref | 40 |
4 files changed, 29 insertions, 27 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 5337c120b9..bd84f9be06 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1404,6 +1404,10 @@ static void mov_write_ftyp_tag(ByteIOContext *pb, AVFormatContext *s) put_be32(pb, 0x200); + if(mov->mode != MODE_MOV){ + put_tag(pb, "isom"); + } + if (mov->mode == MODE_3GP) put_tag(pb, "3gp4"); else if (mov->mode & MODE_3G2) @@ -1412,9 +1416,7 @@ static void mov_write_ftyp_tag(ByteIOContext *pb, AVFormatContext *s) put_tag(pb, "MSNV"); else if (mov->mode == MODE_MP4) put_tag(pb, "mp41"); - else if (mov->mode == MODE_IPOD) - put_tag(pb, "isom"); - else + else if(mov->mode == MODE_MOV) put_tag(pb, "qt "); return updateSize(pb, pos); } diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref index d20eb17aa9..609c6ec34a 100644 --- 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 -eedd720a38629ea0990685b30b697404 *./tests/data/a-odivx.mp4 -550779 ./tests/data/a-odivx.mp4 +520a3f041c5edf57183e7c5a8b902cc4 *./tests/data/a-odivx.mp4 +550783 ./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 89d0ca3a28..47573d470f 100644 --- 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 -15a7e083ad743c0bcfe68e6b18f11098 *./tests/data/a-odivx.mp4 -119789 ./tests/data/a-odivx.mp4 +d173ea6adf8cd942483596cee3b68cc0 *./tests/data/a-odivx.mp4 +119793 ./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 e1ac17dc5e..8cc362faa1 100644 --- 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:36 size:8719 flags:1 +ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:40 size:8719 flags:1 ret: 0 st:-1 ts:-1.000000 flags:0 -ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:8719 flags:1 +ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:40 size:8719 flags:1 ret: 0 st:-1 ts:1.894167 flags:1 -ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:75132 size:10776 flags:1 +ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:75136 size:10776 flags:1 ret: 0 st: 0 ts:0.800000 flags:0 -ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:47220 size:9634 flags:1 +ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:47224 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:75132 size:10776 flags:1 +ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:75136 size:10776 flags:1 ret: 0 st: 0 ts:0.360000 flags:0 -ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:23263 size:8524 flags:1 +ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:23267 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:47220 size:9634 flags:1 +ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:47224 size:9634 flags:1 ret: 0 st: 0 ts:-0.040000 flags:0 -ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:8719 flags:1 +ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:40 size:8719 flags:1 ret: 0 st: 0 ts:2.840000 flags:1 -ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:106159 size:11182 flags:1 +ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:106163 size:11182 flags:1 ret: 0 st:-1 ts:1.730004 flags:0 -ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:106159 size:11182 flags:1 +ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:106163 size:11182 flags:1 ret: 0 st:-1 ts:0.624171 flags:1 -ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:23263 size:8524 flags:1 +ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:23267 size:8524 flags:1 ret: 0 st: 0 ts:-0.480000 flags:0 -ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:8719 flags:1 +ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:40 size:8719 flags:1 ret: 0 st: 0 ts:2.400000 flags:1 -ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:106159 size:11182 flags:1 +ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:106163 size:11182 flags:1 ret: 0 st:-1 ts:1.306672 flags:0 -ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:75132 size:10776 flags:1 +ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:75136 size:10776 flags:1 ret: 0 st:-1 ts:0.200839 flags:1 -ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:8719 flags:1 +ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:40 size:8719 flags:1 ret: 0 st: 0 ts:-0.920000 flags:0 -ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:8719 flags:1 +ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:40 size:8719 flags:1 ret: 0 st: 0 ts:2.000000 flags:1 -ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:106159 size:11182 flags:1 +ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:106163 size:11182 flags:1 ret: 0 st:-1 ts:0.883340 flags:0 -ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:47220 size:9634 flags:1 +ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:47224 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:75132 size:10776 flags:1 +ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:75136 size:10776 flags:1 ret: 0 st:-1 ts:0.460008 flags:0 -ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:23263 size:8524 flags:1 +ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:23267 size:8524 flags:1 ret:-1 st:-1 ts:-0.645825 flags:1 ---------------- tests/data/a-rv10.rm |