diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-02-05 14:32:10 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-02-07 20:11:11 +0100 |
| commit | 1270e12e49c9039fa5fe18cfb45137558d127f92 (patch) | |
| tree | 2ff84e541b91ef8c10db23273ff809115303e0fc /tests/ref/lavf | |
| parent | c9af8326238c37d1a1f0029a158c7ede33836aa3 (diff) | |
| download | ffmpeg-1270e12e49c9039fa5fe18cfb45137558d127f92.tar.gz | |
avconv: rework -t handling for encoding.
Current code compares the desired recording time with InputStream.pts,
which has a very unclear meaning. Change the code to use actual
timestamps of the frames passed to the encoder.
In several tests, one less frame is encoded, which is more correct.
In the idroq test one more frame is encoded, which is again more
correct.
Behavior with stream copy should be unchanged.
Diffstat (limited to 'tests/ref/lavf')
| -rw-r--r-- | tests/ref/lavf/asf | 4 | ||||
| -rw-r--r-- | tests/ref/lavf/avi | 6 | ||||
| -rw-r--r-- | tests/ref/lavf/ffm | 4 | ||||
| -rw-r--r-- | tests/ref/lavf/mkv | 6 | ||||
| -rw-r--r-- | tests/ref/lavf/mpg | 4 | ||||
| -rw-r--r-- | tests/ref/lavf/nut | 6 | ||||
| -rw-r--r-- | tests/ref/lavf/ogg | 6 | ||||
| -rw-r--r-- | tests/ref/lavf/rm | 4 | ||||
| -rw-r--r-- | tests/ref/lavf/ts | 6 |
9 files changed, 23 insertions, 23 deletions
diff --git a/tests/ref/lavf/asf b/tests/ref/lavf/asf index 533a3c3591..2d4788aee8 100644 --- a/tests/ref/lavf/asf +++ b/tests/ref/lavf/asf @@ -1,3 +1,3 @@ -c544bb40c2f4c09d44318db5228ee499 *./tests/data/lavf/lavf.asf +98ffddfa94926558ecf20cc6f47236a6 *./tests/data/lavf/lavf.asf 333375 ./tests/data/lavf/lavf.asf -./tests/data/lavf/lavf.asf CRC=0x9f5ab3e6 +./tests/data/lavf/lavf.asf CRC=0x51485213 diff --git a/tests/ref/lavf/avi b/tests/ref/lavf/avi index cf47755ab7..ae85efc50b 100644 --- a/tests/ref/lavf/avi +++ b/tests/ref/lavf/avi @@ -1,3 +1,3 @@ -7e5e4db8c04f0acd16cff6b30e60d0e5 *./tests/data/lavf/lavf.avi -331032 ./tests/data/lavf/lavf.avi -./tests/data/lavf/lavf.avi CRC=0x2a83e6b0 +e056e1164236b22fafc8325de8221a58 *./tests/data/lavf/lavf.avi +330798 ./tests/data/lavf/lavf.avi +./tests/data/lavf/lavf.avi CRC=0xa79b84dd diff --git a/tests/ref/lavf/ffm b/tests/ref/lavf/ffm index 73e94ddfd6..0ae40f59d9 100644 --- a/tests/ref/lavf/ffm +++ b/tests/ref/lavf/ffm @@ -1,3 +1,3 @@ -4ef091d638bb20b8eaef5b3a0d6f97b7 *./tests/data/lavf/lavf.ffm +c963591a7f9a08d48e0f988640795690 *./tests/data/lavf/lavf.ffm 376832 ./tests/data/lavf/lavf.ffm -./tests/data/lavf/lavf.ffm CRC=0xf361ed74 +./tests/data/lavf/lavf.ffm CRC=0x88f58ba1 diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv index 05eb67dd1c..8185d15a61 100644 --- a/tests/ref/lavf/mkv +++ b/tests/ref/lavf/mkv @@ -1,3 +1,3 @@ -a36c2d9378b9870880556ced1cb89ecf *./tests/data/lavf/lavf.mkv - 320478 ./tests/data/lavf/lavf.mkv -./tests/data/lavf/lavf.mkv CRC=0x2a83e6b0 +ed1f083a7d2169c51e5894dabed061df *./tests/data/lavf/lavf.mkv +320262 ./tests/data/lavf/lavf.mkv +./tests/data/lavf/lavf.mkv CRC=0xa79b84dd diff --git a/tests/ref/lavf/mpg b/tests/ref/lavf/mpg index b81cb8a8de..1b63d753fb 100644 --- a/tests/ref/lavf/mpg +++ b/tests/ref/lavf/mpg @@ -1,3 +1,3 @@ -dd60652c2193670abffb8c2a123a820e *./tests/data/lavf/lavf.mpg +f0b995c0c10b08133f5138069c3e9786 *./tests/data/lavf/lavf.mpg 372736 ./tests/data/lavf/lavf.mpg -./tests/data/lavf/lavf.mpg CRC=0xf361ed74 +./tests/data/lavf/lavf.mpg CRC=0x88f58ba1 diff --git a/tests/ref/lavf/nut b/tests/ref/lavf/nut index 461b18587c..e658434849 100644 --- a/tests/ref/lavf/nut +++ b/tests/ref/lavf/nut @@ -1,3 +1,3 @@ -16b9d2cf8effb7dae316c6b9248a49b7 *./tests/data/lavf/lavf.nut -319888 ./tests/data/lavf/lavf.nut -./tests/data/lavf/lavf.nut CRC=0x2a83e6b0 +7e44a8ed5ff2fe5442f758d48fe1b496 *./tests/data/lavf/lavf.nut +319680 ./tests/data/lavf/lavf.nut +./tests/data/lavf/lavf.nut CRC=0xa79b84dd diff --git a/tests/ref/lavf/ogg b/tests/ref/lavf/ogg index b90bb70276..7bc66a3657 100644 --- a/tests/ref/lavf/ogg +++ b/tests/ref/lavf/ogg @@ -1,3 +1,3 @@ -b55661ae1a65f99af249d8efc7619a03 *./tests/data/lavf/lavf.ogg -13819 ./tests/data/lavf/lavf.ogg -./tests/data/lavf/lavf.ogg CRC=0xf1ae5536 +37147a98d9a484208389efa6a1f8796f *./tests/data/lavf/lavf.ogg +13966 ./tests/data/lavf/lavf.ogg +./tests/data/lavf/lavf.ogg CRC=0x37a143ea diff --git a/tests/ref/lavf/rm b/tests/ref/lavf/rm index eae422ae4d..27054969c6 100644 --- a/tests/ref/lavf/rm +++ b/tests/ref/lavf/rm @@ -1,2 +1,2 @@ -2e3d6b1944c6cd2cf14e13055aecf82a *./tests/data/lavf/lavf.rm -346706 ./tests/data/lavf/lavf.rm +f3ce1f1850655ae43f6184ae436acb70 *./tests/data/lavf/lavf.rm +346414 ./tests/data/lavf/lavf.rm diff --git a/tests/ref/lavf/ts b/tests/ref/lavf/ts index ebe6a77566..94937669e1 100644 --- a/tests/ref/lavf/ts +++ b/tests/ref/lavf/ts @@ -1,3 +1,3 @@ -293142d7286db15e5f4d7d1ca0d9c97c *./tests/data/lavf/lavf.ts -406644 ./tests/data/lavf/lavf.ts -./tests/data/lavf/lavf.ts CRC=0x133216c1 +9b59f71822c6dde18fb38b084c150285 *./tests/data/lavf/lavf.ts +406456 ./tests/data/lavf/lavf.ts +./tests/data/lavf/lavf.ts CRC=0x64fab4df |