diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-05-05 21:23:28 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-05-05 21:23:28 +0000 |
| commit | dd17409ca075b35db85e56795078b718a702cf86 (patch) | |
| tree | 591bc513472bf9ae5d459cb82e37f7e36eb14ac2 | |
| parent | 8a0c66a7e370ce87cbedf5630a7681fe60ba2761 (diff) | |
| download | ffmpeg-dd17409ca075b35db85e56795078b718a702cf86.tar.gz | |
next_pts fix by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
note, dont take the PSNR/stddev values serious, they are caused by a bug in ffmpeg.c which drops one frame before the last frame during encoding with b frames
Originally committed as revision 3110 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | ffmpeg.c | 2 | ||||
| -rw-r--r-- | tests/ffmpeg.regression.ref | 12 | ||||
| -rw-r--r-- | tests/rotozoom.regression.ref | 12 |
3 files changed, 13 insertions, 13 deletions
@@ -1003,7 +1003,7 @@ static int output_packet(AVInputStream *ist, int ist_index, void *buffer_to_free; if (pkt && pkt->pts != AV_NOPTS_VALUE) { - ist->pts = pkt->pts; + ist->next_pts = ist->pts = pkt->pts; } else { ist->pts = ist->next_pts; } diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref index 7ddcb8c6df..8f501a5f69 100644 --- a/tests/ffmpeg.regression.ref +++ b/tests/ffmpeg.regression.ref @@ -53,20 +53,20 @@ stddev: 8.05 PSNR:30.00 bytes:7602176 stddev: 0.00 PSNR:99.99 bytes:7602176 a06eb02738bc67c61392fe2fced2afa9 *./data/a-mpeg4-rc.avi 816398 ./data/a-mpeg4-rc.avi -8bcc9847ceab4b879d69fcd904747d18 *./data/out.yuv -stddev: 10.11 PSNR:28.02 bytes:7145472 +11efbbf01c8473ac5eabd775f1c0bec5 *./data/out.yuv +stddev: 11.51 PSNR:26.89 bytes:7299072 451bd18acf3c169301c215a63a3b216d *./data/a-mpeg4-adv.avi 592570 ./data/a-mpeg4-adv.avi 9f4fbff593dd0bd7ad437ceee4afc11f *./data/out.yuv stddev: 10.31 PSNR:27.85 bytes:7602176 3424145af47f83c77bd42f4707c1a722 *./data/a-mpeg4-thread.avi 752408 ./data/a-mpeg4-thread.avi -7e07f0c47f02b87e713be9c5d435f9c2 *./data/out.yuv -stddev: 12.04 PSNR:26.50 bytes:7145472 +51b7bfb3cbf1580eefc61e610451e67e *./data/out.yuv +stddev: 13.17 PSNR:25.72 bytes:7299072 36688568f48f40163c338c6f3435c132 *./data/a-mpeg4-Q.avi 875964 ./data/a-mpeg4-Q.avi -55b24a6a0bb5064720931ddf2bb39b0d *./data/out.yuv -stddev: 5.71 PSNR:32.98 bytes:7145472 +dca5adb5fca49a806e71266f1a04c3a5 *./data/out.yuv +stddev: 8.15 PSNR:29.89 bytes:7299072 771f65ff24c0d32b37f2663892b2f433 *./data/a-error-mpeg4-adv.avi 767796 ./data/a-error-mpeg4-adv.avi a25db8ad6a845e97fd4eb1e8bf343b73 *./data/out.yuv diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref index 32941246ca..b7e496e83a 100644 --- a/tests/rotozoom.regression.ref +++ b/tests/rotozoom.regression.ref @@ -53,20 +53,20 @@ dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv stddev: 0.00 PSNR:99.99 bytes:7602176 ca8f249763ca162cbee43cb32b7b165b *./data/a-mpeg4-rc.avi 223932 ./data/a-mpeg4-rc.avi -05a188bd2479dd9384270c65beb02aa5 *./data/out.yuv -stddev: 4.33 PSNR:35.38 bytes:7145472 +5ad73d80df55d60384a43b8260174912 *./data/out.yuv +stddev: 5.28 PSNR:33.66 bytes:7299072 8249cc83e341cd18e45adf589e1d254e *./data/a-mpeg4-adv.avi 180988 ./data/a-mpeg4-adv.avi a46b891f446aef2c025dc2847dc86ed6 *./data/out.yuv stddev: 4.95 PSNR:34.22 bytes:7602176 f2f6e3841d4a5def6d70297b09a6df6c *./data/a-mpeg4-thread.avi 249670 ./data/a-mpeg4-thread.avi -bc4a00140a3d3f1b1c4a892e9f7eaec6 *./data/out.yuv -stddev: 4.11 PSNR:35.82 bytes:7145472 +e01d0d5a98d2624b107e13c6f50c533c *./data/out.yuv +stddev: 5.09 PSNR:33.97 bytes:7299072 96333905f57a579396c5121d6651fc7e *./data/a-mpeg4-Q.avi 159744 ./data/a-mpeg4-Q.avi -eae6a894c0f0907908f3426e114ec27b *./data/out.yuv -stddev: 4.01 PSNR:36.06 bytes:7145472 +f44b074a83b177950055ddd6da7e518d *./data/out.yuv +stddev: 5.02 PSNR:34.09 bytes:7299072 901ebdbc7438744f0832a9a0cc7678e3 *./data/a-error-mpeg4-adv.avi 194318 ./data/a-error-mpeg4-adv.avi f9ae5845930dda375afead55cfb8480b *./data/out.yuv |