diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2007-12-03 10:23:09 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-12-03 10:23:09 +0000 |
| commit | 7548783bc5cfd67f1fba9aedd75ac54d43ac01d3 (patch) | |
| tree | 783b23d0c5495bbb2af6cc4db19cc34d90361cc9 | |
| parent | 6b80f1a12d047d1d3916f0fcf16717dc5343bfdc (diff) | |
| download | ffmpeg-7548783bc5cfd67f1fba9aedd75ac54d43ac01d3.tar.gz | |
correct invalid duration
Originally committed as revision 11152 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/asf-enc.c | 2 | ||||
| -rw-r--r-- | tests/ffmpeg.regression.ref | 4 | ||||
| -rw-r--r-- | tests/libav.regression.ref | 2 | ||||
| -rw-r--r-- | tests/rotozoom.regression.ref | 4 |
4 files changed, 5 insertions, 7 deletions
diff --git a/libavformat/asf-enc.c b/libavformat/asf-enc.c index 0e9aa9df45..ef2dd278a9 100644 --- a/libavformat/asf-enc.c +++ b/libavformat/asf-enc.c @@ -680,8 +680,6 @@ static void put_frame( // multi payloads frag_len1 = asf->packet_size_left - PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS - PACKET_HEADER_MIN_SIZE - 1; - asf->packet_timestamp_start = timestamp; - if(frag_len1 < payload_len && avst->codec->codec_type == CODEC_TYPE_AUDIO){ flush_packet(s); continue; diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref index 09b668eb97..b648609e48 100644 --- a/tests/ffmpeg.regression.ref +++ b/tests/ffmpeg.regression.ref @@ -192,11 +192,11 @@ c3382f03ce2efb5d475240d288a33898 *./tests/data/a-flac.flac 353368 ./tests/data/a-flac.flac c4228df189aad9567a037727d0e763e4 *./tests/data/out.wav stddev: 33.31 PSNR:65.87 bytes:1040384 -0c406c4e4586ca27064e28637b662631 *./tests/data/a-wmav1.asf +a1e56bb034c2773438ba1c830c4cea07 *./tests/data/a-wmav1.asf 106004 ./tests/data/a-wmav1.asf stddev:12251.50 PSNR:14.56 bytes:1056768 stddev:2106.00 PSNR:29.85 bytes:1048576 -82442aaa5fdbd327769e4c4ad369147e *./tests/data/a-wmav2.asf +5e25c447c80fa937f74ed8752b0e26fb *./tests/data/a-wmav2.asf 106044 ./tests/data/a-wmav2.asf stddev:12255.92 PSNR:14.55 bytes:1056768 stddev:2099.31 PSNR:29.88 bytes:1048576 diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref index 67c776a52e..f3a12f51f9 100644 --- a/tests/libav.regression.ref +++ b/tests/libav.regression.ref @@ -2,7 +2,7 @@ ffmpeg regression test 8a0536ccfe36f4fff408b3327d33e1dd *./tests/data/b-libav.avi 340344 ./tests/data/b-libav.avi ./tests/data/b-libav.avi CRC=0x400c29e9 -786446e80ead936e5faa8f5908f19281 *./tests/data/b-libav.asf +7b859661e93df32e51942a4e0531d58e *./tests/data/b-libav.asf 339775 ./tests/data/b-libav.asf ./tests/data/b-libav.asf CRC=0x74113749 c351132527ccb1e8cab06cc0822fde23 *./tests/data/b-libav.rm diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref index 106c6a0da5..d6396f38b3 100644 --- a/tests/rotozoom.regression.ref +++ b/tests/rotozoom.regression.ref @@ -192,11 +192,11 @@ c3382f03ce2efb5d475240d288a33898 *./tests/data/a-flac.flac 353368 ./tests/data/a-flac.flac c4228df189aad9567a037727d0e763e4 *./tests/data/out.wav stddev: 33.31 PSNR:65.87 bytes:1040384 -0c406c4e4586ca27064e28637b662631 *./tests/data/a-wmav1.asf +a1e56bb034c2773438ba1c830c4cea07 *./tests/data/a-wmav1.asf 106004 ./tests/data/a-wmav1.asf stddev:12251.50 PSNR:14.56 bytes:1056768 stddev:2106.00 PSNR:29.85 bytes:1048576 -82442aaa5fdbd327769e4c4ad369147e *./tests/data/a-wmav2.asf +5e25c447c80fa937f74ed8752b0e26fb *./tests/data/a-wmav2.asf 106044 ./tests/data/a-wmav2.asf stddev:12255.92 PSNR:14.55 bytes:1056768 stddev:2099.31 PSNR:29.88 bytes:1048576 |