Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

correct invalid duration

Browse Source 
Originally committed as revision 11152 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Michael Niedermayer 17 years ago
parent 6b80f1a12d
commit 7548783bc5
4 changed files with 5 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavformat/asf-enc.c
  2. 4
      tests/ffmpeg.regression.ref
  3. 2
      tests/libav.regression.ref
  4. 4
      tests/rotozoom.regression.ref

2
libavformat/asf-enc.c
Unescape View File

@ -680,8 +680,6 @@ static void put_frame(
// multi payloads // multi payloads
frag_len1 = asf->packet_size_left - PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS - PACKET_HEADER_MIN_SIZE - 1; 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){ if(frag_len1 < payload_len && avst->codec->codec_type == CODEC_TYPE_AUDIO){
flush_packet(s); flush_packet(s);
continue; continue;

4
tests/ffmpeg.regression.ref
Unescape View File

@ -192,11 +192,11 @@ c3382f03ce2efb5d475240d288a33898 *./tests/data/a-flac.flac
353368 ./tests/data/a-flac.flac 353368 ./tests/data/a-flac.flac
c4228df189aad9567a037727d0e763e4 *./tests/data/out.wav c4228df189aad9567a037727d0e763e4 *./tests/data/out.wav
stddev: 33.31 PSNR:65.87 bytes:1040384 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 106004 ./tests/data/a-wmav1.asf
stddev:12251.50 PSNR:14.56 bytes:1056768 stddev:12251.50 PSNR:14.56 bytes:1056768
stddev:2106.00 PSNR:29.85 bytes:1048576 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 106044 ./tests/data/a-wmav2.asf
stddev:12255.92 PSNR:14.55 bytes:1056768 stddev:12255.92 PSNR:14.55 bytes:1056768
stddev:2099.31 PSNR:29.88 bytes:1048576 stddev:2099.31 PSNR:29.88 bytes:1048576

2
tests/libav.regression.ref
Unescape View File

@ -2,7 +2,7 @@ ffmpeg regression test
8a0536ccfe36f4fff408b3327d33e1dd *./tests/data/b-libav.avi 8a0536ccfe36f4fff408b3327d33e1dd *./tests/data/b-libav.avi
340344 ./tests/data/b-libav.avi 340344 ./tests/data/b-libav.avi
./tests/data/b-libav.avi CRC=0x400c29e9 ./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 339775 ./tests/data/b-libav.asf
./tests/data/b-libav.asf CRC=0x74113749 ./tests/data/b-libav.asf CRC=0x74113749
c351132527ccb1e8cab06cc0822fde23 *./tests/data/b-libav.rm c351132527ccb1e8cab06cc0822fde23 *./tests/data/b-libav.rm

4
tests/rotozoom.regression.ref
Unescape View File

@ -192,11 +192,11 @@ c3382f03ce2efb5d475240d288a33898 *./tests/data/a-flac.flac
353368 ./tests/data/a-flac.flac 353368 ./tests/data/a-flac.flac
c4228df189aad9567a037727d0e763e4 *./tests/data/out.wav c4228df189aad9567a037727d0e763e4 *./tests/data/out.wav
stddev: 33.31 PSNR:65.87 bytes:1040384 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 106004 ./tests/data/a-wmav1.asf
stddev:12251.50 PSNR:14.56 bytes:1056768 stddev:12251.50 PSNR:14.56 bytes:1056768
stddev:2106.00 PSNR:29.85 bytes:1048576 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 106044 ./tests/data/a-wmav2.asf
stddev:12255.92 PSNR:14.55 bytes:1056768 stddev:12255.92 PSNR:14.55 bytes:1056768
stddev:2099.31 PSNR:29.88 bytes:1048576 stddev:2099.31 PSNR:29.88 bytes:1048576

Write Preview
Loading…
Cancel
Save