Commit 8272de4e authored by Michael Niedermayer's avatar Michael Niedermayer

fix time stored in mov

based upon 23_fix_timestamp_in_mov.patch by (Calcium | calcium nurs or jp)

Originally committed as revision 4067 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent a9aa3467
...@@ -1426,7 +1426,7 @@ static int mov_write_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -1426,7 +1426,7 @@ static int mov_write_packet(AVFormatContext *s, AVPacket *pkt)
if (mov->mdat_written == 0) { if (mov->mdat_written == 0) {
mov_write_mdat_tag(pb, mov); mov_write_mdat_tag(pb, mov);
mov->mdat_written = 1; mov->mdat_written = 1;
mov->time = s->timestamp; mov->time = s->timestamp + 0x7C25B080; //1970 based -> 1904 based
} }
trk->cluster[cl][id].pos = url_ftell(pb); trk->cluster[cl][id].pos = url_ftell(pb);
......
...@@ -51,7 +51,7 @@ fc01a5723a0d629bb73c74d64692120d *./data/a-h263p.avi ...@@ -51,7 +51,7 @@ fc01a5723a0d629bb73c74d64692120d *./data/a-h263p.avi
2414342 ./data/a-h263p.avi 2414342 ./data/a-h263p.avi
28fd12ac0b168252d81df6f6e60a5d17 *./data/out.yuv 28fd12ac0b168252d81df6f6e60a5d17 *./data/out.yuv
stddev: 2.07 PSNR:41.76 bytes:7602176 stddev: 2.07 PSNR:41.76 bytes:7602176
cdfb6316e67fcdfccf169ea4162f8aba *./data/a-odivx.mp4 9aceeacc860415019807c8f5f462dd1b *./data/a-odivx.mp4
554440 ./data/a-odivx.mp4 554440 ./data/a-odivx.mp4
e400c9175dd1811cdeee7be5555d33f1 *./data/out.yuv e400c9175dd1811cdeee7be5555d33f1 *./data/out.yuv
stddev: 7.99 PSNR:30.06 bytes:7602176 stddev: 7.99 PSNR:30.06 bytes:7602176
...@@ -119,7 +119,7 @@ a7ef4746f27be309138c188e327d3ebe *./data/a-ffv1.avi ...@@ -119,7 +119,7 @@ a7ef4746f27be309138c188e327d3ebe *./data/a-ffv1.avi
2653642 ./data/a-ffv1.avi 2653642 ./data/a-ffv1.avi
799d3db687f6cdd7a837ec156efc171f *./data/out.yuv 799d3db687f6cdd7a837ec156efc171f *./data/out.yuv
stddev: 0.00 PSNR:99.99 bytes:7602176 stddev: 0.00 PSNR:99.99 bytes:7602176
923e667d26550585de32096161bf7513 *./data/a-svq1.mov b5b6275f58f012de73644bbaa9080097 *./data/a-svq1.mov
1383999 ./data/a-svq1.mov 1383999 ./data/a-svq1.mov
ccc201054669e94717022bb4f2aea4ce *./data/out.yuv ccc201054669e94717022bb4f2aea4ce *./data/out.yuv
stddev: 10.99 PSNR:27.30 bytes:7602176 stddev: 10.99 PSNR:27.30 bytes:7602176
......
...@@ -19,7 +19,7 @@ c83444a0e8ef47b6af1d868d1bb21696 *./data/b-libav.asf ...@@ -19,7 +19,7 @@ c83444a0e8ef47b6af1d868d1bb21696 *./data/b-libav.asf
794934a02582f8dfc85d1856514cf37c *./data/b-libav.flv 794934a02582f8dfc85d1856514cf37c *./data/b-libav.flv
339325 ./data/b-libav.flv 339325 ./data/b-libav.flv
./data/b-libav.flv CRC=7b9076f8 ./data/b-libav.flv CRC=7b9076f8
f5b0461def8fe53550e7464056906563 *./data/b-libav.mov a2b938a9f14030d2f4bd4e32d98e9b0a *./data/b-libav.mov
369865 ./data/b-libav.mov 369865 ./data/b-libav.mov
./data/b-libav.mov CRC=48f5a90d ./data/b-libav.mov CRC=48f5a90d
f34e560f8f0f2c603cf0cb3e7eeb031b *./data/b-libav.nut f34e560f8f0f2c603cf0cb3e7eeb031b *./data/b-libav.nut
......
...@@ -51,7 +51,7 @@ stddev: 5.44 PSNR:33.41 bytes:7602176 ...@@ -51,7 +51,7 @@ stddev: 5.44 PSNR:33.41 bytes:7602176
868164 ./data/a-h263p.avi 868164 ./data/a-h263p.avi
80fb224bebbe2e04f228da7485b905c5 *./data/out.yuv 80fb224bebbe2e04f228da7485b905c5 *./data/out.yuv
stddev: 1.91 PSNR:42.49 bytes:7602176 stddev: 1.91 PSNR:42.49 bytes:7602176
0daf00d71c7fd36eea4e0528a0463ae3 *./data/a-odivx.mp4 0c19edbe67bfbb521569ee95ebdd3fa5 *./data/a-odivx.mp4
120196 ./data/a-odivx.mp4 120196 ./data/a-odivx.mp4
8b7657a7f9fc7298cc016abb466d1d19 *./data/out.yuv 8b7657a7f9fc7298cc016abb466d1d19 *./data/out.yuv
stddev: 5.34 PSNR:33.56 bytes:7602176 stddev: 5.34 PSNR:33.56 bytes:7602176
...@@ -119,7 +119,7 @@ d0831a8339491fd680b650f05262e5d9 *./data/a-ffv1.avi ...@@ -119,7 +119,7 @@ d0831a8339491fd680b650f05262e5d9 *./data/a-ffv1.avi
3524768 ./data/a-ffv1.avi 3524768 ./data/a-ffv1.avi
dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv
stddev: 0.00 PSNR:99.99 bytes:7602176 stddev: 0.00 PSNR:99.99 bytes:7602176
562ee6563e6ccf6531e3c8f856fd694f *./data/a-svq1.mov 920c610ec324b772d882b0717e375943 *./data/a-svq1.mov
768683 ./data/a-svq1.mov 768683 ./data/a-svq1.mov
89b1946242e6998e05fc9a6e09668edd *./data/out.yuv 89b1946242e6998e05fc9a6e09668edd *./data/out.yuv
stddev: 3.43 PSNR:37.39 bytes:7602176 stddev: 3.43 PSNR:37.39 bytes:7602176
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment