Commit 7548783b authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

correct invalid duration

Originally committed as revision 11152 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 6b80f1a1
......@@ -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;
......
......@@ -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
......@@ -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
......
......@@ -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
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