ffmpeg: remove obsolete workaround in trim insertion.
authorNicolas George <nicolas.george@normalesup.org>
Wed, 7 Aug 2013 12:46:07 +0000 (14:46 +0200)
committerNicolas George <nicolas.george@normalesup.org>
Wed, 7 Aug 2013 14:20:41 +0000 (16:20 +0200)
The bug it was working seems to have been fixed.
This change causes ffmpeg to use the trim filter to implement
the -t option.
FATE tests are updated due to the more accurate handling of
the last packets.

38 files changed:
ffmpeg_filter.c
tests/ref/fate/adpcm-ima-amv
tests/ref/fate/adpcm-ms-mono
tests/ref/fate/bethsoft-vid
tests/ref/fate/cyberia-c93
tests/ref/fate/msvideo1-8bit
tests/ref/lavf/aiff
tests/ref/lavf/alaw
tests/ref/lavf/asf
tests/ref/lavf/ast
tests/ref/lavf/au
tests/ref/lavf/avi
tests/ref/lavf/caf
tests/ref/lavf/dv_fmt
tests/ref/lavf/ffm
tests/ref/lavf/gxf
tests/ref/lavf/ircam
tests/ref/lavf/mkv
tests/ref/lavf/mmf
tests/ref/lavf/mov
tests/ref/lavf/mpg
tests/ref/lavf/mulaw
tests/ref/lavf/mxf
tests/ref/lavf/nut
tests/ref/lavf/ogg
tests/ref/lavf/rm
tests/ref/lavf/rso
tests/ref/lavf/smjpeg
tests/ref/lavf/sox
tests/ref/lavf/ts
tests/ref/lavf/voc
tests/ref/lavf/voc_s16
tests/ref/lavf/w64
tests/ref/lavf/wav
tests/ref/lavf/wtv
tests/ref/seek/lavf-alaw
tests/ref/seek/lavf-mov
tests/ref/seek/lavf-mulaw

index c8164ed..e17c4a5 100644 (file)
@@ -290,10 +290,6 @@ static int insert_trim(int64_t start_time, int64_t duration,
     if (duration == INT64_MAX && start_time == AV_NOPTS_VALUE)
         return 0;
 
-    // Use with duration and without output starttime is buggy with trim filters
-    if (start_time == AV_NOPTS_VALUE)
-        return 0;
-
     trim = avfilter_get_by_name(name);
     if (!trim) {
         av_log(NULL, AV_LOG_ERROR, "%s filter not present, cannot limit "
index ca7a168..4bd22af 100644 (file)
 0,     215010,     215010,     1380,     2760, 0xb83548f4
 0,     216390,     216390,     1378,     2756, 0x22647962
 0,     217768,     217768,     1378,     2756, 0x14ca54d3
-0,     219146,     219146,     1378,     2756, 0x58754b3a
+0,     219146,     219146,     1354,     2708, 0x85e82e8d
index 3bf44f8..c456708 100644 (file)
@@ -43,4 +43,4 @@
 0,      20500,      20500,      500,     1000, 0xf195eb44
 0,      21000,      21000,      500,     1000, 0xa491f3ef
 0,      21500,      21500,      500,     1000, 0x2c036e18
-0,      22000,      22000,      500,     1000, 0x52d65e2a
+0,      22000,      22000,       50,      100, 0x0bd81f05
index f59823c..9f96da1 100644 (file)
 0,         68,         68,        1,   192000, 0x3ec3cce1
 1,      54760,      54760,      537,     1074, 0x142ce7ba
 0,         69,         69,        1,   192000, 0x159313a8
-1,      55297,      55297,      925,     1850, 0x7ff682f7
+1,      55297,      55297,      258,      516, 0x98885b26
index 2c71e50..f02435c 100644 (file)
@@ -36,7 +36,7 @@
 0,         30,         30,        1,   184320, 0x54975910
 0,         31,         31,        1,   184320, 0xf4857db9
 0,         32,         32,        1,   184320, 0x82d18161
-1,      42552,      42552,    14184,    28368, 0x9101e519
+1,      42552,      42552,     5835,    11670, 0x04aa0b1e
 0,         33,         33,        1,   184320, 0x06d93bd0
 0,         34,         34,        1,   184320, 0xa4304c00
 0,         35,         35,        1,   184320, 0x5f77d9cd
index 6e6bc0b..74d54e8 100644 (file)
@@ -29,4 +29,3 @@
 0,         27,         27,        1,    57600, 0x4ec4a868
 0,         28,         28,        1,    57600, 0x7db370a1
 0,         29,         29,        1,    57600, 0x2b1e52f6
-0,         30,         30,        1,    57600, 0x2141467c
index 2a5cd81..c504c18 100644 (file)
@@ -1,3 +1,3 @@
-b0d42747a6fc99a5cd1ab0e861671f3a *./tests/data/lavf/lavf.aif
-90182 ./tests/data/lavf/lavf.aif
-./tests/data/lavf/lavf.aif CRC=0xf1ae5536
+2c129d88acef834e32869145fe792b9c *./tests/data/lavf/lavf.aif
+88270 ./tests/data/lavf/lavf.aif
+./tests/data/lavf/lavf.aif CRC=0x3a1da17e
index 65bcf99..d93d6fc 100644 (file)
@@ -1,3 +1,3 @@
-8bce9c3758b0d38da2e0718b6ab57fb4 *./tests/data/lavf/lavf.al
-45056 ./tests/data/lavf/lavf.al
-./tests/data/lavf/lavf.al CRC=0x5e6d372b
+652d96e474869ddb01403743deb35117 *./tests/data/lavf/lavf.al
+44100 ./tests/data/lavf/lavf.al
+./tests/data/lavf/lavf.al CRC=0xf9643112
index cfa53dc..a90e547 100644 (file)
@@ -1,3 +1,3 @@
-3937dfece4b48c0cdd8f44bcab3cdd2d *./tests/data/lavf/lavf.asf
+6bc7dc5698c3607fad8937d14560e50c *./tests/data/lavf/lavf.asf
 333581 ./tests/data/lavf/lavf.asf
-./tests/data/lavf/lavf.asf CRC=0x51485213
+./tests/data/lavf/lavf.asf CRC=0xf6340a10
index 72a9824..513c612 100644 (file)
@@ -1,3 +1,3 @@
-7fa8cd2dd7453428e71930a7c65f7b62 *./tests/data/lavf/lavf.ast
-181696 ./tests/data/lavf/lavf.ast
-./tests/data/lavf/lavf.ast CRC=0x7bd585ff
+07f5d23aa8bade984034f7005bd72947 *./tests/data/lavf/lavf.ast
+177872 ./tests/data/lavf/lavf.ast
+./tests/data/lavf/lavf.ast CRC=0xe61e3bd0
index b9b70a1..ede4926 100644 (file)
@@ -1,3 +1,3 @@
-dc54f834a23ddc0c086a86f0cef898d7 *./tests/data/lavf/lavf.au
-90144 ./tests/data/lavf/lavf.au
-./tests/data/lavf/lavf.au CRC=0xf1ae5536
+aa5ec1f82ac07c653ffc527b0f0dc10d *./tests/data/lavf/lavf.au
+88232 ./tests/data/lavf/lavf.au
+./tests/data/lavf/lavf.au CRC=0x3a1da17e
index 056d0c7..3cbb44f 100644 (file)
@@ -1,3 +1,3 @@
-feb26a85f820ede7e521a55be565f3b1 *./tests/data/lavf/lavf.avi
+8d3a3554cbe21bc232603ca26b0c4d3e *./tests/data/lavf/lavf.avi
 330806 ./tests/data/lavf/lavf.avi
-./tests/data/lavf/lavf.avi CRC=0x4780846b
+./tests/data/lavf/lavf.avi CRC=0xec6c3c68
index f2ae9c3..7b2a67d 100644 (file)
@@ -1,3 +1,3 @@
-6c97bfc8e455d5fb8b3b45806857a953 *./tests/data/lavf/lavf.caf
-90235 ./tests/data/lavf/lavf.caf
-./tests/data/lavf/lavf.caf CRC=0xf1ae5536
+c3c38cba600722c87c0e75bd0688b7fc *./tests/data/lavf/lavf.caf
+88323 ./tests/data/lavf/lavf.caf
+./tests/data/lavf/lavf.caf CRC=0x3a1da17e
index ed8c5cc..3c8e5b1 100644 (file)
@@ -1,9 +1,9 @@
 11be3e5caa2892236b3475c3f7807b76 *./tests/data/lavf/lavf.dv
 3600000 ./tests/data/lavf/lavf.dv
 ./tests/data/lavf/lavf.dv CRC=0x25bdd732
-78db8504eefb660ed205b417157d4f44 *./tests/data/lavf/lavf.dv
-3600000 ./tests/data/lavf/lavf.dv
-./tests/data/lavf/lavf.dv CRC=0x1cec8738
+e9949bc767924e1e7d28856029fee024 *./tests/data/lavf/lavf.dv
+3480000 ./tests/data/lavf/lavf.dv
+./tests/data/lavf/lavf.dv CRC=0xc4f27ca7
 87d3b20f656235671383a7eaa2f66330 *./tests/data/lavf/lavf.dv
 3600000 ./tests/data/lavf/lavf.dv
 ./tests/data/lavf/lavf.dv CRC=0x0e868a82
index 6f67365..7071866 100644 (file)
@@ -1,3 +1,3 @@
-d33fae310a7f6db1dc7fb74d1a9e0e6a *./tests/data/lavf/lavf.ffm
+6f1443b952819cff1dae875529675e88 *./tests/data/lavf/lavf.ffm
 376832 ./tests/data/lavf/lavf.ffm
-./tests/data/lavf/lavf.ffm CRC=0x5b136bb1
+./tests/data/lavf/lavf.ffm CRC=0x000e23ae
index bdcbd1c..14a2c87 100644 (file)
@@ -1,9 +1,9 @@
-a9672bb2a5b7927bf362f76bcce9bdf7 *./tests/data/lavf/lavf.gxf
+9c96119322262ed2c43b34fd415233cc *./tests/data/lavf/lavf.gxf
 795876 ./tests/data/lavf/lavf.gxf
-./tests/data/lavf/lavf.gxf CRC=0x147ff044
-2138952377f92d9c3a036f576197dbd7 *./tests/data/lavf/lavf.gxf
+./tests/data/lavf/lavf.gxf CRC=0xda7cebbc
+260acc1c88a1706e5aaa74eff99ac389 *./tests/data/lavf/lavf.gxf
 794656 ./tests/data/lavf/lavf.gxf
-./tests/data/lavf/lavf.gxf CRC=0xe0199511
-f89a6b3e8a2c88eacafef7e283e6418b *./tests/data/lavf/lavf.gxf
+./tests/data/lavf/lavf.gxf CRC=0x7f0c9089
+3cb8bab80b73a95f51e50989ccf06817 *./tests/data/lavf/lavf.gxf
 795876 ./tests/data/lavf/lavf.gxf
-./tests/data/lavf/lavf.gxf CRC=0xd9d58865
+./tests/data/lavf/lavf.gxf CRC=0x5ade0285
index e29a7ad..47e0709 100644 (file)
@@ -1,3 +1,3 @@
-2cfae025de1b13098ef84a5e7f9947aa *./tests/data/lavf/lavf.ircam
-91136 ./tests/data/lavf/lavf.ircam
-./tests/data/lavf/lavf.ircam CRC=0xf1ae5536
+45d9a4667030e95d1d8fb6ab012f1aa0 *./tests/data/lavf/lavf.ircam
+89224 ./tests/data/lavf/lavf.ircam
+./tests/data/lavf/lavf.ircam CRC=0x3a1da17e
index 20e8e1c..4bb97fd 100644 (file)
@@ -1,6 +1,6 @@
-b9557a7fa418db7692587b45d20f0d76 *./tests/data/lavf/lavf.mkv
+6273e6c20231e89e167f99706388b1b5 *./tests/data/lavf/lavf.mkv
 472542 ./tests/data/lavf/lavf.mkv
-./tests/data/lavf/lavf.mkv CRC=0x4780846b
-fd214bc74f0a21dfb36dcf9bb5777b86 *./tests/data/lavf/lavf.mkv
+./tests/data/lavf/lavf.mkv CRC=0xec6c3c68
+36633da729b88a171a0dfc969db23bcc *./tests/data/lavf/lavf.mkv
 320274 ./tests/data/lavf/lavf.mkv
-./tests/data/lavf/lavf.mkv CRC=0x4780846b
+./tests/data/lavf/lavf.mkv CRC=0xec6c3c68
index fea8015..fae95ca 100644 (file)
@@ -1,3 +1,3 @@
-b165af6f2e5c6c1de733e9d3848bcebb *./tests/data/lavf/lavf.mmf
+643fadf7482f6d937ed75ec4f508e4f1 *./tests/data/lavf/lavf.mmf
 22611 ./tests/data/lavf/lavf.mmf
-./tests/data/lavf/lavf.mmf CRC=0x03633476
+./tests/data/lavf/lavf.mmf CRC=0x8dea1388
index 2ed8ad0..3b484ec 100644 (file)
@@ -1,12 +1,12 @@
-fcbe7806047914d9751fd9053009df69 *./tests/data/lavf/lavf.mov
-367365 ./tests/data/lavf/lavf.mov
-./tests/data/lavf/lavf.mov CRC=0xb2f59ab4
-72eac0051107a16e41d5263dab640f26 *./tests/data/lavf/lavf.mov
-358455 ./tests/data/lavf/lavf.mov
-./tests/data/lavf/lavf.mov CRC=0xb2f59ab4
-cf6ea2e8d4d16626d9dbd9e3fb802ce6 *./tests/data/lavf/lavf.mov
-367549 ./tests/data/lavf/lavf.mov
-./tests/data/lavf/lavf.mov CRC=0x6e82384a
-7c932d24837f46ef57d3e40a61331565 *./tests/data/lavf/lavf.mov
-357837 ./tests/data/lavf/lavf.mov
-./tests/data/lavf/lavf.mov CRC=0xb2f59ab4
+673de726034d2a44be176fa8166df376 *./tests/data/lavf/lavf.mov
+366421 ./tests/data/lavf/lavf.mov
+./tests/data/lavf/lavf.mov CRC=0xbb2b949b
+e833d2e258ee20ef7c13470be8ea293b *./tests/data/lavf/lavf.mov
+357511 ./tests/data/lavf/lavf.mov
+./tests/data/lavf/lavf.mov CRC=0xbb2b949b
+75fd61635a9707a8bed9a32958fe3275 *./tests/data/lavf/lavf.mov
+366593 ./tests/data/lavf/lavf.mov
+./tests/data/lavf/lavf.mov CRC=0xa9793231
+9bcbda2320a1434a3b9470389b45564e *./tests/data/lavf/lavf.mov
+356893 ./tests/data/lavf/lavf.mov
+./tests/data/lavf/lavf.mov CRC=0xbb2b949b
index 798ee03..9feff66 100644 (file)
@@ -1,9 +1,9 @@
-ddc5cd5469eb8a0500f8a725baead5e5 *./tests/data/lavf/lavf.mpg
+0a8c879bf813b6b758806088f29842dc *./tests/data/lavf/lavf.mpg
 372736 ./tests/data/lavf/lavf.mpg
-./tests/data/lavf/lavf.mpg CRC=0x5b136bb1
-7962eab004026dd7a8c0417470cdf574 *./tests/data/lavf/lavf.mpg
+./tests/data/lavf/lavf.mpg CRC=0x000e23ae
+d9446ae7b49de006a5a0f052ea9333ca *./tests/data/lavf/lavf.mpg
 389120 ./tests/data/lavf/lavf.mpg
-./tests/data/lavf/lavf.mpg CRC=0xbbbf92bc
-bb22933de60193bce9032f67ce6fcc23 *./tests/data/lavf/lavf.mpg
+./tests/data/lavf/lavf.mpg CRC=0x60ba4ab9
+edfef790122870cf4652e8a92ca558a0 *./tests/data/lavf/lavf.mpg
 372736 ./tests/data/lavf/lavf.mpg
-./tests/data/lavf/lavf.mpg CRC=0x5b136bb1
+./tests/data/lavf/lavf.mpg CRC=0x000e23ae
index c6fa058..bd54084 100644 (file)
@@ -1,3 +1,3 @@
-e64027a96ad5907ee281deff3286da0a *./tests/data/lavf/lavf.ul
-45056 ./tests/data/lavf/lavf.ul
-./tests/data/lavf/lavf.ul CRC=0xe028b50a
+ad492935e361f830f2f8302aa102701d *./tests/data/lavf/lavf.ul
+44100 ./tests/data/lavf/lavf.ul
+./tests/data/lavf/lavf.ul CRC=0x4515fa26
index b1e46e9..b1918f5 100644 (file)
@@ -1,9 +1,9 @@
 967f6ee9223c865328f4891465191108 *./tests/data/lavf/lavf.mxf
 525369 ./tests/data/lavf/lavf.mxf
 ./tests/data/lavf/lavf.mxf CRC=0xdbfff6f1
-7788939d349d09a7f9b546e59376a496 *./tests/data/lavf/lavf.mxf
+a085845074129d732fc6adb5601e3b5e *./tests/data/lavf/lavf.mxf
 560697 ./tests/data/lavf/lavf.mxf
-./tests/data/lavf/lavf.mxf CRC=0xb69f428b
+./tests/data/lavf/lavf.mxf CRC=0x3ff4178e
 ce535b606423d117675213b16275206a *./tests/data/lavf/lavf.mxf
 525369 ./tests/data/lavf/lavf.mxf
 ./tests/data/lavf/lavf.mxf CRC=0xdbfff6f1
index 72e59e8..6c42a40 100644 (file)
@@ -1,3 +1,3 @@
-56c403dd91ae1dd4569348381b2b43a4 *./tests/data/lavf/lavf.nut
+66386a488ee35e4592b605f63ef90a73 *./tests/data/lavf/lavf.nut
 319902 ./tests/data/lavf/lavf.nut
-./tests/data/lavf/lavf.nut CRC=0x4780846b
+./tests/data/lavf/lavf.nut CRC=0xec6c3c68
index 584e09b..f8b58c4 100644 (file)
@@ -1,3 +1,3 @@
-ce1734741fa50c6c85f9cc8f410a720c *./tests/data/lavf/lavf.ogg
-13985 ./tests/data/lavf/lavf.ogg
-./tests/data/lavf/lavf.ogg CRC=0x37a143ea
+304a201b4afa3583b206bdeef177ce6b *./tests/data/lavf/lavf.ogg
+13495 ./tests/data/lavf/lavf.ogg
+./tests/data/lavf/lavf.ogg CRC=0x3a1da17e
index d396e00..62e0a31 100644 (file)
@@ -1,2 +1,2 @@
-a3a875be9c528a2a4534a5a31230fdae *./tests/data/lavf/lavf.rm
+e30681d05d6f3d24108d3614600bf116 *./tests/data/lavf/lavf.rm
 346424 ./tests/data/lavf/lavf.rm
index 648c248..5878f43 100644 (file)
@@ -1,3 +1,3 @@
-f41fd78f7df981802e7caeb23648b8c0 *./tests/data/lavf/lavf.rso
-45064 ./tests/data/lavf/lavf.rso
-./tests/data/lavf/lavf.rso CRC=0x74b2b546
+443b72346065d6318ca18c8395aa1d87 *./tests/data/lavf/lavf.rso
+44108 ./tests/data/lavf/lavf.rso
+./tests/data/lavf/lavf.rso CRC=0x298fd284
index 3e7e8ed..a2eeb97 100644 (file)
@@ -1,3 +1,3 @@
-2f6e613e9e257545e1048d57de92ba92 *./tests/data/lavf/lavf.smjpeg
-791463 ./tests/data/lavf/lavf.smjpeg
-./tests/data/lavf/lavf.smjpeg CRC=0x557714ff
+a95982a2d390f4dcdc72a41d8920abb9 *./tests/data/lavf/lavf.smjpeg
+789551 ./tests/data/lavf/lavf.smjpeg
+./tests/data/lavf/lavf.smjpeg CRC=0x54bf6147
index 0026480..fc368b1 100644 (file)
@@ -1,3 +1,3 @@
-e6f278256f145b69ed06f35b8d3585c1 *./tests/data/lavf/lavf.sox
-180256 ./tests/data/lavf/lavf.sox
-./tests/data/lavf/lavf.sox CRC=0xf1ae5536
+683635d5cb1344e44fa96df90c3a993c *./tests/data/lavf/lavf.sox
+176432 ./tests/data/lavf/lavf.sox
+./tests/data/lavf/lavf.sox CRC=0x3a1da17e
index d795c27..02921ed 100644 (file)
@@ -1,3 +1,3 @@
-04ba219e6f56f7b0fa4a47765323d204 *./tests/data/lavf/lavf.ts
+a876e6bde8a2e8c7eca878869433ad3b *./tests/data/lavf/lavf.ts
 407020 ./tests/data/lavf/lavf.ts
-./tests/data/lavf/lavf.ts CRC=0xcc2dc628
+./tests/data/lavf/lavf.ts CRC=0x71287e25
index 062da63..ded8af7 100644 (file)
@@ -1,3 +1,3 @@
-e4cefbeb4c20f5735de1877fbcfd8d1d *./tests/data/lavf/lavf.voc
-45261 ./tests/data/lavf/lavf.voc
-./tests/data/lavf/lavf.voc CRC=0x74b2b546
+bb5ad96a5e1b35683d50bf18115db821 *./tests/data/lavf/lavf.voc
+44305 ./tests/data/lavf/lavf.voc
+./tests/data/lavf/lavf.voc CRC=0x298fd284
index 23e5aab..d026090 100644 (file)
@@ -1,3 +1,3 @@
-a8225786fdbf5a2a19d1eeaf15f28632 *./tests/data/lavf/lavf.s16.voc
-180439 ./tests/data/lavf/lavf.s16.voc
-./tests/data/lavf/lavf.s16.voc CRC=0x7bd585ff
+db9fa22ff71992bd8b6cc80047223c92 *./tests/data/lavf/lavf.s16.voc
+176615 ./tests/data/lavf/lavf.s16.voc
+./tests/data/lavf/lavf.s16.voc CRC=0xe61e3bd0
index 9acda83..7da4f09 100644 (file)
@@ -1,3 +1,3 @@
-420bf38762386ae2ba8bf2e85b6cc7f2 *./tests/data/lavf/lavf.w64
-90224 ./tests/data/lavf/lavf.w64
-./tests/data/lavf/lavf.w64 CRC=0xf1ae5536
+062b91c34d570a90af8d55427804878e *./tests/data/lavf/lavf.w64
+88312 ./tests/data/lavf/lavf.w64
+./tests/data/lavf/lavf.w64 CRC=0x3a1da17e
index cc8ec1d..600c26a 100644 (file)
@@ -1,3 +1,3 @@
-c4afa6eafac5243aa1c202397789ccb8 *./tests/data/lavf/lavf.wav
-90188 ./tests/data/lavf/lavf.wav
-./tests/data/lavf/lavf.wav CRC=0xf1ae5536
+eb5a869456d2e9107bb195c8c99be1a1 *./tests/data/lavf/lavf.wav
+88276 ./tests/data/lavf/lavf.wav
+./tests/data/lavf/lavf.wav CRC=0x3a1da17e
index f54f862..fe1b83c 100644 (file)
@@ -1,3 +1,3 @@
-237211f6aa3df9da2dfe0f7d5b8ba85c *./tests/data/lavf/lavf.wtv
+98dd5205889313542da71351fbaf4172 *./tests/data/lavf/lavf.wtv
 413696 ./tests/data/lavf/lavf.wtv
-./tests/data/lavf/lavf.wtv CRC=0xcc2dc628
+./tests/data/lavf/lavf.wtv CRC=0x71287e25
index 84661ec..4b1f8fb 100644 (file)
@@ -38,7 +38,7 @@ ret: 0         st: 0 flags:1 dts: 0.200816 pts: 0.200816 pos:   4428 size:  1024
 ret: 0         st: 0 flags:0  ts:-0.904989
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:  1024
 ret: 0         st: 0 flags:1  ts: 1.989161
-ret: 0         st: 0 flags:1 dts: 1.989161 pts: 1.989161 pos:  43861 size:  1024
+ret: 0         st: 0 flags:1 dts: 1.989161 pts: 1.989161 pos:  43861 size:   239
 ret: 0         st:-1 flags:0  ts: 0.883340
 ret: 0         st: 0 flags:1 dts: 0.883356 pts: 0.883356 pos:  19478 size:  1024
 ret: 0         st:-1 flags:1  ts:-0.222493
index 9563a0d..93a9a23 100644 (file)
@@ -1,48 +1,48 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1727 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1739 size: 27837
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1727 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1739 size: 27837
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326931 size:  1024
+ret: 0         st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326943 size:  1024
 ret: 0         st: 0 flags:0  ts: 0.788359
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327955 size: 27834
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327967 size: 27834
 ret: 0         st: 0 flags:1  ts:-0.317500
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1727 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1739 size: 27837
 ret:-1         st: 1 flags:0  ts: 2.576667
 ret: 0         st: 1 flags:1  ts: 1.470839
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327955 size: 27834
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327967 size: 27834
 ret: 0         st:-1 flags:0  ts: 0.365002
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 165209 size: 27925
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 165221 size: 27925
 ret: 0         st:-1 flags:1  ts:-0.740831
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1727 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1739 size: 27837
 ret:-1         st: 0 flags:0  ts: 2.153359
 ret: 0         st: 0 flags:1  ts: 1.047500
-ret: 0         st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326931 size:  1024
+ret: 0         st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326943 size:  1024
 ret: 0         st: 1 flags:0  ts:-0.058322
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1727 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1739 size: 27837
 ret: 0         st: 1 flags:1  ts: 2.835828
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327955 size: 27834
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327967 size: 27834
 ret:-1         st:-1 flags:0  ts: 1.730004
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 1 flags:1 dts: 0.464399 pts: 0.464399 pos: 164185 size:  1024
+ret: 0         st: 1 flags:1 dts: 0.464399 pts: 0.464399 pos: 164197 size:  1024
 ret: 0         st: 0 flags:0  ts:-0.481641
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1727 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1739 size: 27837
 ret: 0         st: 0 flags:1  ts: 2.412500
-ret: 0         st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326931 size:  1024
+ret: 0         st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326943 size:  1024
 ret:-1         st: 1 flags:0  ts: 1.306667
 ret: 0         st: 1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1727 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1739 size: 27837
 ret: 0         st:-1 flags:0  ts:-0.904994
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1727 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1739 size: 27837
 ret: 0         st:-1 flags:1  ts: 1.989173
-ret: 0         st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326931 size:  1024
+ret: 0         st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326943 size:  1024
 ret: 0         st: 0 flags:0  ts: 0.883359
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327955 size: 27834
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327967 size: 27834
 ret: 0         st: 0 flags:1  ts:-0.222500
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1727 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1739 size: 27837
 ret:-1         st: 1 flags:0  ts: 2.671678
 ret: 0         st: 1 flags:1  ts: 1.565850
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327955 size: 27834
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327967 size: 27834
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 165209 size: 27925
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 165221 size: 27925
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1727 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1739 size: 27837
index 84661ec..4b1f8fb 100644 (file)
@@ -38,7 +38,7 @@ ret: 0         st: 0 flags:1 dts: 0.200816 pts: 0.200816 pos:   4428 size:  1024
 ret: 0         st: 0 flags:0  ts:-0.904989
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:  1024
 ret: 0         st: 0 flags:1  ts: 1.989161
-ret: 0         st: 0 flags:1 dts: 1.989161 pts: 1.989161 pos:  43861 size:  1024
+ret: 0         st: 0 flags:1 dts: 1.989161 pts: 1.989161 pos:  43861 size:   239
 ret: 0         st:-1 flags:0  ts: 0.883340
 ret: 0         st: 0 flags:1 dts: 0.883356 pts: 0.883356 pos:  19478 size:  1024
 ret: 0         st:-1 flags:1  ts:-0.222493