Merge commit '0bca0283ccded5e32da143a462168ad1988a58fd'

* commit '0bca0283ccded5e32da143a462168ad1988a58fd':
  riff: do not write empty INFO tags

Conflicts:
	tests/ref/fate/vsynth1-cljr
	tests/ref/fate/vsynth1-ffvhuff
	tests/ref/fate/vsynth1-h261
	tests/ref/fate/vsynth1-h263
	tests/ref/fate/vsynth1-h263-obmc
	tests/ref/fate/vsynth1-h263p
	tests/ref/fate/vsynth1-huffyuv
	tests/ref/fate/vsynth1-jpegls
	tests/ref/fate/vsynth1-mjpeg
	tests/ref/fate/vsynth1-mpeg4-adap
	tests/ref/fate/vsynth1-mpeg4-adv
	tests/ref/fate/vsynth1-mpeg4-error
	tests/ref/fate/vsynth1-mpeg4-nr
	tests/ref/fate/vsynth1-mpeg4-qpel
	tests/ref/fate/vsynth1-mpeg4-qprd
	tests/ref/fate/vsynth1-mpeg4-rc
	tests/ref/fate/vsynth1-mpeg4-thread
	tests/ref/fate/vsynth1-msmpeg4
	tests/ref/fate/vsynth1-msmpeg4v2
	tests/ref/fate/vsynth1-rgb
	tests/ref/fate/vsynth1-wmv1
	tests/ref/fate/vsynth1-wmv2
	tests/ref/fate/vsynth1-yuv
	tests/ref/fate/vsynth2-cljr
	tests/ref/fate/vsynth2-ffvhuff
	tests/ref/fate/vsynth2-h261
	tests/ref/fate/vsynth2-h263
	tests/ref/fate/vsynth2-h263-obmc
	tests/ref/fate/vsynth2-h263p
	tests/ref/fate/vsynth2-huffyuv
	tests/ref/fate/vsynth2-jpegls
	tests/ref/fate/vsynth2-mjpeg
	tests/ref/fate/vsynth2-mpeg4-adap
	tests/ref/fate/vsynth2-mpeg4-error
	tests/ref/fate/vsynth2-mpeg4-nr
	tests/ref/fate/vsynth2-mpeg4-qpel
	tests/ref/fate/vsynth2-mpeg4-qprd
	tests/ref/fate/vsynth2-mpeg4-rc
	tests/ref/fate/vsynth2-mpeg4-thread
	tests/ref/fate/vsynth2-msmpeg4
	tests/ref/fate/vsynth2-msmpeg4v2
	tests/ref/fate/vsynth2-rgb
	tests/ref/fate/vsynth2-wmv1
	tests/ref/fate/vsynth2-wmv2
	tests/ref/fate/vsynth2-yuv
	tests/ref/lavf/avi
	tests/ref/seek/h261_avi
	tests/ref/seek/h263_avi
	tests/ref/seek/h263p_avi
	tests/ref/seek/lavf_avi
	tests/ref/seek/mjpeg_avi
	tests/ref/seek/mpeg4_adap_avi
	tests/ref/seek/mpeg4_error_avi
	tests/ref/seek/mpeg4_nr_avi
	tests/ref/seek/mpeg4_qpel_avi
	tests/ref/seek/mpeg4_qprd_avi
	tests/ref/seek/mpeg4_rc_avi
	tests/ref/seek/mpeg4_thread_avi
	tests/ref/seek/msmpeg4_avi
	tests/ref/seek/msmpeg4v2_avi
	tests/ref/seek/wmv1_avi
	tests/ref/seek/wmv2_avi

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavformat/riff.c
Simple merge

diff --cc tests/ref/fate/options-force_key_frames
index 205296c,0000000..1288624
mode 100644,000000..100644
--- 1/tests/ref/fate/options-force_key_frames
--- /dev/null
+++ b/tests/ref/fate/options-force_key_frames
@@@ -1,4 -1,0 +1,4 @@@
- 654970e7a09ff4869596c2a47e698007 *tests/data/fate/options-force_key_frames.avi
- 113320 tests/data/fate/options-force_key_frames.avi
++5423335cd809e631a2e03f97585348e0 *tests/data/fate/options-force_key_frames.avi
++113308 tests/data/fate/options-force_key_frames.avi
 +8f68ad2e602ecd87a3e0c097ba99d773 *tests/data/fate/options-force_key_frames.out.framecrc
 +stddev:34363.01 PSNR:  5.61 MAXDIFF:56305 bytes:  7603200/      186

diff --cc tests/ref/fate/vsynth1-amv
index 9abfb05,0000000..f7c7f57
mode 100644,000000..100644
--- 1/tests/ref/fate/vsynth1-amv
--- /dev/null
+++ b/tests/ref/fate/vsynth1-amv
@@@ -1,4 -1,0 +1,4 @@@
- 00947dc33a092a3080d78d5bf69ed4e3 *tests/data/fate/vsynth1-amv.avi
- 1365508 tests/data/fate/vsynth1-amv.avi
++34c4d4033d31c7401d32fee9d6ce0de2 *tests/data/fate/vsynth1-amv.avi
++1365496 tests/data/fate/vsynth1-amv.avi
 +e38681b9527b6d2531942f8a176a0265 *tests/data/fate/vsynth1-amv.out.rawvideo
 +stddev:   10.07 PSNR: 28.06 MAXDIFF:   98 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-cljr
index 77d73b2,cdd6ca2..5207d92
--- 1/tests/ref/fate/vsynth1-cljr
--- 2/tests/ref/fate/vsynth1-cljr
+++ b/tests/ref/fate/vsynth1-cljr
@@@ -1,4 -1,4 +1,4 @@@
- 041982e4fa83428c621a127647d47b3f *tests/data/fate/vsynth1-cljr.avi
- 5075660 tests/data/fate/vsynth1-cljr.avi
 -41fc45d5e8bca3cf2be35457b188cdb3 *tests/data/fate/vsynth1-cljr.avi
++eb9131f74c29cda83ba706293c85afb4 *tests/data/fate/vsynth1-cljr.avi
+ 5075648 tests/data/fate/vsynth1-cljr.avi
 -72e01607bae16527bc6389cf6db00b5f *tests/data/fate/vsynth1-cljr.out.rawvideo
 -stddev:    6.95 PSNR: 31.28 MAXDIFF:   86 bytes:  7603200/  7603200
 +7bd979b8b397f7bac22a0102c7889452 *tests/data/fate/vsynth1-cljr.out.rawvideo
 +stddev:    6.74 PSNR: 31.55 MAXDIFF:   84 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-ffvhuff
index fc44dff,cf86f57..d752c4b
--- 1/tests/ref/fate/vsynth1-ffvhuff
--- 2/tests/ref/fate/vsynth1-ffvhuff
+++ b/tests/ref/fate/vsynth1-ffvhuff
@@@ -1,4 -1,4 +1,4 @@@
- 0632ffae6f1e06dd299bf41a845b9099 *tests/data/fate/vsynth1-ffvhuff.avi
- 5987208 tests/data/fate/vsynth1-ffvhuff.avi
 -2279cfd5efce9dc3435b814f1f95dcbc *tests/data/fate/vsynth1-ffvhuff.avi
++96789e7ed68de5314e65bc496c75e0a5 *tests/data/fate/vsynth1-ffvhuff.avi
+ 5987196 tests/data/fate/vsynth1-ffvhuff.avi
  c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-ffvhuff.out.rawvideo
  stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-h261
index eb9575d,b350e6f..02b956b
--- 1/tests/ref/fate/vsynth1-h261
--- 2/tests/ref/fate/vsynth1-h261
+++ b/tests/ref/fate/vsynth1-h261
@@@ -1,4 -1,4 +1,4 @@@
- fe87fa742c7f04449c5b1dd55bfe70e6 *tests/data/fate/vsynth1-h261.avi
- 707558 tests/data/fate/vsynth1-h261.avi
 -d3397557ad8a02d28cb5feeb0b51e5c8 *tests/data/fate/vsynth1-h261.avi
 -707576 tests/data/fate/vsynth1-h261.avi
 -716e83cb51afb1246bfaa80967df48ea *tests/data/fate/vsynth1-h261.out.rawvideo
++2e613918f64c3473b887306fc5eb3c3d *tests/data/fate/vsynth1-h261.avi
++707546 tests/data/fate/vsynth1-h261.avi
 +85fde92037c2ccecc02e2d6c21a169b0 *tests/data/fate/vsynth1-h261.out.rawvideo
  stddev:    9.11 PSNR: 28.93 MAXDIFF:  113 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-h263
index 9f31fc6,d5916fa..f985d61
--- 1/tests/ref/fate/vsynth1-h263
--- 2/tests/ref/fate/vsynth1-h263
+++ b/tests/ref/fate/vsynth1-h263
@@@ -1,4 -1,4 +1,4 @@@
- 0037e453d71210d9d6a2d625c490705c *tests/data/fate/vsynth1-h263.avi
- 659686 tests/data/fate/vsynth1-h263.avi
 -130ae384b6f12fd7d18979aa5371523a *tests/data/fate/vsynth1-h263.avi
++36abb66d2480121f66a23e07d2b903be *tests/data/fate/vsynth1-h263.avi
+ 659674 tests/data/fate/vsynth1-h263.avi
 -1a1ba9a3a63ec1a1a9585fded0a7c954 *tests/data/fate/vsynth1-h263.out.rawvideo
 +aef88517578fa7f53fe5159c4b6754ef *tests/data/fate/vsynth1-h263.out.rawvideo
  stddev:    8.03 PSNR: 30.03 MAXDIFF:  103 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-h263-obmc
index d82c425,ca3d4bf..f60e252
--- 1/tests/ref/fate/vsynth1-h263-obmc
--- 2/tests/ref/fate/vsynth1-h263-obmc
+++ b/tests/ref/fate/vsynth1-h263-obmc
@@@ -1,4 -1,4 +1,4 @@@
- bdd8f9cafa39df97f2e395110f4419e0 *tests/data/fate/vsynth1-h263-obmc.avi
- 657328 tests/data/fate/vsynth1-h263-obmc.avi
 -4e7faa9203abf55a492802d30a8d80ea *tests/data/fate/vsynth1-h263-obmc.avi
 -657354 tests/data/fate/vsynth1-h263-obmc.avi
 -eba1d733a0c4b71322a78f718f312599 *tests/data/fate/vsynth1-h263-obmc.out.rawvideo
++ec2262cb7c674fd85afb14d9eb27d9d6 *tests/data/fate/vsynth1-h263-obmc.avi
++657316 tests/data/fate/vsynth1-h263-obmc.avi
 +844f7ee27fa122e199fe20987b41a15c *tests/data/fate/vsynth1-h263-obmc.out.rawvideo
  stddev:    8.16 PSNR: 29.89 MAXDIFF:  113 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-h263p
index a4cf7c8,9e1765f..72ef0ff
--- 1/tests/ref/fate/vsynth1-h263p
--- 2/tests/ref/fate/vsynth1-h263p
+++ b/tests/ref/fate/vsynth1-h263p
@@@ -1,4 -1,4 +1,4 @@@
- 7474e28919ea4a6951e1534b951ddd28 *tests/data/fate/vsynth1-h263p.avi
- 2328374 tests/data/fate/vsynth1-h263p.avi
 -b34c1a52bb504e702485d8d268dd1068 *tests/data/fate/vsynth1-h263p.avi
 -2328336 tests/data/fate/vsynth1-h263p.avi
 -9554cda00c3487ab3ffda2c3ea22fa2f *tests/data/fate/vsynth1-h263p.out.rawvideo
++03ebe03b70ee93524ec30c5abb69205a *tests/data/fate/vsynth1-h263p.avi
++2328362 tests/data/fate/vsynth1-h263p.avi
 +911330cb57c99c440234392be1588081 *tests/data/fate/vsynth1-h263p.out.rawvideo
  stddev:    2.06 PSNR: 41.83 MAXDIFF:   20 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-huffyuv
index 3d55c6b,246da19..ed08365
--- 1/tests/ref/fate/vsynth1-huffyuv
--- 2/tests/ref/fate/vsynth1-huffyuv
+++ b/tests/ref/fate/vsynth1-huffyuv
@@@ -1,4 -1,4 +1,4 @@@
- f5f2e109af0612694ff3cd6464063e82 *tests/data/fate/vsynth1-huffyuv.avi
- 7933800 tests/data/fate/vsynth1-huffyuv.avi
 -cd93849c8e9846490d8f950f1b2319d5 *tests/data/fate/vsynth1-huffyuv.avi
++829bf3e22e5d1df2aa9a709c9d5aff57 *tests/data/fate/vsynth1-huffyuv.avi
+ 7933788 tests/data/fate/vsynth1-huffyuv.avi
  c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-huffyuv.out.rawvideo
  stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-j2k
index e434db8,0000000..1e2f3f2
mode 100644,000000..100644
--- 1/tests/ref/fate/vsynth1-j2k
--- /dev/null
+++ b/tests/ref/fate/vsynth1-j2k
@@@ -1,4 -1,0 +1,4 @@@
- 8da8ef50cccb9996f4bebbc585c4edb4 *tests/data/fate/vsynth1-j2k.avi
- 2306914 tests/data/fate/vsynth1-j2k.avi
++e6e3d338eeb394d6fadc7bbb55fa9e6e *tests/data/fate/vsynth1-j2k.avi
++2306902 tests/data/fate/vsynth1-j2k.avi
 +ee9b245b3b07eed90bc6f2147bbd916c *tests/data/fate/vsynth1-j2k.out.rawvideo
 +stddev:    5.47 PSNR: 33.37 MAXDIFF:   64 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-jpegls
index de4f109,b54bd5d..fc21074
--- 1/tests/ref/fate/vsynth1-jpegls
--- 2/tests/ref/fate/vsynth1-jpegls
+++ b/tests/ref/fate/vsynth1-jpegls
@@@ -1,4 -1,4 +1,4 @@@
- 870dceeb6d3931dd68b34f0c33be5d26 *tests/data/fate/vsynth1-jpegls.avi
- 9089812 tests/data/fate/vsynth1-jpegls.avi
+ f8acf917e24ea6c9200f2cdf99744ca9 *tests/data/fate/vsynth1-jpegls.avi
+ 9089800 tests/data/fate/vsynth1-jpegls.avi
 -947cb24ec45a453348ae6fe3fa278071 *tests/data/fate/vsynth1-jpegls.out.rawvideo
 -stddev:    2.85 PSNR: 39.03 MAXDIFF:   49 bytes:  7603200/  7603200
 +791e1fb999deb2e4156e2286d48c4ed1 *tests/data/fate/vsynth1-jpegls.out.rawvideo
 +stddev:    2.84 PSNR: 39.04 MAXDIFF:   49 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-mjpeg
index 6fd5c5b,3c6fb4b..80f15ca
--- 1/tests/ref/fate/vsynth1-mjpeg
--- 2/tests/ref/fate/vsynth1-mjpeg
+++ b/tests/ref/fate/vsynth1-mjpeg
@@@ -1,4 -1,4 +1,4 @@@
- add304152c969eeb073157ccc9cc7799 *tests/data/fate/vsynth1-mjpeg.avi
- 1515914 tests/data/fate/vsynth1-mjpeg.avi
 -b3ff9a5a9699ceddfee9abbf1b06bb00 *tests/data/fate/vsynth1-mjpeg.avi
 -1516128 tests/data/fate/vsynth1-mjpeg.avi
 -c6ae81b5b896e4d05ff584311aebdb18 *tests/data/fate/vsynth1-mjpeg.out.rawvideo
++3d3a9cef95621e1c153649721c5a8590 *tests/data/fate/vsynth1-mjpeg.avi
++1515902 tests/data/fate/vsynth1-mjpeg.avi
 +9a3b8169c251d19044f7087a95458c55 *tests/data/fate/vsynth1-mjpeg.out.rawvideo
  stddev:    7.87 PSNR: 30.21 MAXDIFF:   63 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-mpeg4-adap
index 1764e25,840eb47..00ea53d
--- 1/tests/ref/fate/vsynth1-mpeg4-adap
--- 2/tests/ref/fate/vsynth1-mpeg4-adap
+++ b/tests/ref/fate/vsynth1-mpeg4-adap
@@@ -1,4 -1,4 +1,4 @@@
- 520ee9e41fc09c5ad0d4b9852a2ea1d2 *tests/data/fate/vsynth1-mpeg4-adap.avi
 -eb70136b050f0b216febe57e7766b6a8 *tests/data/fate/vsynth1-mpeg4-adap.avi
--403444 tests/data/fate/vsynth1-mpeg4-adap.avi
 -fa2049396479b5f170aa764fed5b2a31 *tests/data/fate/vsynth1-mpeg4-adap.out.rawvideo
++2aa8bfefc09135a9a25dc23e3a14c6a4 *tests/data/fate/vsynth1-mpeg4-adap.avi
++403432 tests/data/fate/vsynth1-mpeg4-adap.avi
 +fad0b9dc08fe4a95b297af1a7411c1e9 *tests/data/fate/vsynth1-mpeg4-adap.out.rawvideo
  stddev:   14.05 PSNR: 25.17 MAXDIFF:  184 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-mpeg4-adv
index c328a42,8ca1f2f..a67cc14
--- 1/tests/ref/fate/vsynth1-mpeg4-adv
--- 2/tests/ref/fate/vsynth1-mpeg4-adv
+++ b/tests/ref/fate/vsynth1-mpeg4-adv
@@@ -1,4 -1,4 +1,4 @@@
- 5b2b17eac3210b85d847e7088469b53c *tests/data/fate/vsynth1-mpeg4-adv.avi
- 589716 tests/data/fate/vsynth1-mpeg4-adv.avi
 -c67ccefff2a038c1a149eceef8b08d1e *tests/data/fate/vsynth1-mpeg4-adv.avi
++b12cf575e8a28975cfeb67c23870afdd *tests/data/fate/vsynth1-mpeg4-adv.avi
+ 589704 tests/data/fate/vsynth1-mpeg4-adv.avi
 -f8b226876b1b2c0b98fd6928fd9adbd8 *tests/data/fate/vsynth1-mpeg4-adv.out.rawvideo
 +b651bd94456005a1990fb64c28306262 *tests/data/fate/vsynth1-mpeg4-adv.out.rawvideo
  stddev:    6.98 PSNR: 31.25 MAXDIFF:   84 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-mpeg4-error
index ab3a266,9180911..b694362
--- 1/tests/ref/fate/vsynth1-mpeg4-error
--- 2/tests/ref/fate/vsynth1-mpeg4-error
+++ b/tests/ref/fate/vsynth1-mpeg4-error
@@@ -1,4 -1,4 +1,4 @@@
- ed45da2282cbc0a3e4d4d45bbcab71d8 *tests/data/fate/vsynth1-mpeg4-error.avi
- 752358 tests/data/fate/vsynth1-mpeg4-error.avi
 -63fdc6877c299fe94a061e276ca77bad *tests/data/fate/vsynth1-mpeg4-error.avi
 -756824 tests/data/fate/vsynth1-mpeg4-error.avi
 -79e94ba32b37759397362cbcb479d4d3 *tests/data/fate/vsynth1-mpeg4-error.out.rawvideo
 -stddev:   18.36 PSNR: 22.85 MAXDIFF:  243 bytes:  7603200/  7603200
++5a6d923425ff437924d4723aa73a817f *tests/data/fate/vsynth1-mpeg4-error.avi
++752346 tests/data/fate/vsynth1-mpeg4-error.avi
 +5853c8c789f260ae4dcbf37a17d04b66 *tests/data/fate/vsynth1-mpeg4-error.out.rawvideo
 +stddev:   17.33 PSNR: 23.35 MAXDIFF:  229 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-mpeg4-nr
index 4814b1a,28f8c6a..e71dd2b
--- 1/tests/ref/fate/vsynth1-mpeg4-nr
--- 2/tests/ref/fate/vsynth1-mpeg4-nr
+++ b/tests/ref/fate/vsynth1-mpeg4-nr
@@@ -1,4 -1,4 +1,4 @@@
- 9f990e290b5978f0243ea5a2141feb6c *tests/data/fate/vsynth1-mpeg4-nr.avi
- 675464 tests/data/fate/vsynth1-mpeg4-nr.avi
 -d9eabca19ca600f18539b35a94663603 *tests/data/fate/vsynth1-mpeg4-nr.avi
 -675626 tests/data/fate/vsynth1-mpeg4-nr.avi
 -d2b89d5958fb7331f6c9e5b7ecaaa5b6 *tests/data/fate/vsynth1-mpeg4-nr.out.rawvideo
 -stddev:    6.99 PSNR: 31.23 MAXDIFF:   86 bytes:  7603200/  7603200
++6515d1676d4d0c92c85c0468c53261aa *tests/data/fate/vsynth1-mpeg4-nr.avi
++675452 tests/data/fate/vsynth1-mpeg4-nr.avi
 +5fee518cde41e5567f800fbe14210fb8 *tests/data/fate/vsynth1-mpeg4-nr.out.rawvideo
 +stddev:    6.99 PSNR: 31.24 MAXDIFF:   86 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-mpeg4-qpel
index 00c0022,1ff1dce..67b72a1
--- 1/tests/ref/fate/vsynth1-mpeg4-qpel
--- 2/tests/ref/fate/vsynth1-mpeg4-qpel
+++ b/tests/ref/fate/vsynth1-mpeg4-qpel
@@@ -1,4 -1,4 +1,4 @@@
- 8636a8011e315dafe7fa66e493a41174 *tests/data/fate/vsynth1-mpeg4-qpel.avi
- 858692 tests/data/fate/vsynth1-mpeg4-qpel.avi
 -c02be5680307d8f97a2f442d27f48f3c *tests/data/fate/vsynth1-mpeg4-qpel.avi
 -860666 tests/data/fate/vsynth1-mpeg4-qpel.avi
 -756928496245ecc701f79eebeec8e5e6 *tests/data/fate/vsynth1-mpeg4-qpel.out.rawvideo
 -stddev:    5.63 PSNR: 33.12 MAXDIFF:   70 bytes:  7603200/  7603200
++594626acf31cbfc4a14af4d9b3cd8a6c *tests/data/fate/vsynth1-mpeg4-qpel.avi
++858680 tests/data/fate/vsynth1-mpeg4-qpel.avi
 +5089090df7169eb482532df5471d7f5f *tests/data/fate/vsynth1-mpeg4-qpel.out.rawvideo
 +stddev:    5.63 PSNR: 33.11 MAXDIFF:   70 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-mpeg4-qprd
index 8a5f84c,0b2892d..0475e70
--- 1/tests/ref/fate/vsynth1-mpeg4-qprd
--- 2/tests/ref/fate/vsynth1-mpeg4-qprd
+++ b/tests/ref/fate/vsynth1-mpeg4-qprd
@@@ -1,4 -1,4 +1,4 @@@
- d4746d1d22f2d464b1cdd6cc2d63ddcf *tests/data/fate/vsynth1-mpeg4-qprd.avi
- 710684 tests/data/fate/vsynth1-mpeg4-qprd.avi
 -5a95ba2c240fcb28963fe90fba4ce52b *tests/data/fate/vsynth1-mpeg4-qprd.avi
 -710932 tests/data/fate/vsynth1-mpeg4-qprd.avi
 -e65f4c7f343fe2bad1cac44b7da5f7c4 *tests/data/fate/vsynth1-mpeg4-qprd.out.rawvideo
++96590e5921628ff84d109624e6124911 *tests/data/fate/vsynth1-mpeg4-qprd.avi
++710672 tests/data/fate/vsynth1-mpeg4-qprd.avi
 +693231ac7e6fbf8758415f9f2509408d *tests/data/fate/vsynth1-mpeg4-qprd.out.rawvideo
  stddev:    9.79 PSNR: 28.31 MAXDIFF:  176 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-mpeg4-rc
index 74bde1c,0c2abf3..96e41be
--- 1/tests/ref/fate/vsynth1-mpeg4-rc
--- 2/tests/ref/fate/vsynth1-mpeg4-rc
+++ b/tests/ref/fate/vsynth1-mpeg4-rc
@@@ -1,4 -1,4 +1,4 @@@
- 7d147478239dbc75f1ea3f7e27b07c95 *tests/data/fate/vsynth1-mpeg4-rc.avi
- 830506 tests/data/fate/vsynth1-mpeg4-rc.avi
 -49ac6ed095ea2dccf53737e6beab7ad7 *tests/data/fate/vsynth1-mpeg4-rc.avi
 -830148 tests/data/fate/vsynth1-mpeg4-rc.avi
 -4d95e340db9bc57a559162c039f3784e *tests/data/fate/vsynth1-mpeg4-rc.out.rawvideo
++59cf839b030f7df30b95fd300c4defb1 *tests/data/fate/vsynth1-mpeg4-rc.avi
++830494 tests/data/fate/vsynth1-mpeg4-rc.avi
 +9dcd9d022ae14fe1e4a53aa4865464c6 *tests/data/fate/vsynth1-mpeg4-rc.out.rawvideo
  stddev:   10.24 PSNR: 27.92 MAXDIFF:  196 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-mpeg4-thread
index b60933d,b0bf7d8..a998273
--- 1/tests/ref/fate/vsynth1-mpeg4-thread
--- 2/tests/ref/fate/vsynth1-mpeg4-thread
+++ b/tests/ref/fate/vsynth1-mpeg4-thread
@@@ -1,4 -1,4 +1,4 @@@
- ae675a6a953ddeaecb7a9db14c4d0fa0 *tests/data/fate/vsynth1-mpeg4-thread.avi
- 774762 tests/data/fate/vsynth1-mpeg4-thread.avi
 -c081bc20f1eb048626ea783d8b08a531 *tests/data/fate/vsynth1-mpeg4-thread.avi
 -774748 tests/data/fate/vsynth1-mpeg4-thread.avi
 -64b96cddf5301990e118978b3a3bcd0d *tests/data/fate/vsynth1-mpeg4-thread.out.rawvideo
++14059560812963039e852f4f6419c238 *tests/data/fate/vsynth1-mpeg4-thread.avi
++774750 tests/data/fate/vsynth1-mpeg4-thread.avi
 +9aa327a244d5179acf7fe64dc1459bff *tests/data/fate/vsynth1-mpeg4-thread.out.rawvideo
  stddev:   10.13 PSNR: 28.02 MAXDIFF:  183 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-mpng
index ade0cf4,0000000..5ca268b
mode 100644,000000..100644
--- 1/tests/ref/fate/vsynth1-mpng
--- /dev/null
+++ b/tests/ref/fate/vsynth1-mpng
@@@ -1,4 -1,0 +1,4 @@@
- be741137074c7d3b160e2eec464b8c61 *tests/data/fate/vsynth1-mpng.avi
- 12158288 tests/data/fate/vsynth1-mpng.avi
++10bcdf8600d3985aeb57dc774df2b747 *tests/data/fate/vsynth1-mpng.avi
++12158276 tests/data/fate/vsynth1-mpng.avi
 +93695a27c24a61105076ca7b1f010bbd *tests/data/fate/vsynth1-mpng.out.rawvideo
 +stddev:    3.42 PSNR: 37.44 MAXDIFF:   48 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-msmpeg4
index 8d32ccc,cd1b6db..4adabbe
--- 1/tests/ref/fate/vsynth1-msmpeg4
--- 2/tests/ref/fate/vsynth1-msmpeg4
+++ b/tests/ref/fate/vsynth1-msmpeg4
@@@ -1,4 -1,4 +1,4 @@@
- f63295e3dcf4afe48135667dbe9b60b8 *tests/data/fate/vsynth1-msmpeg4.avi
- 624714 tests/data/fate/vsynth1-msmpeg4.avi
 -c1d04df31764c0ca281dc6fe023287fb *tests/data/fate/vsynth1-msmpeg4.avi
 -624706 tests/data/fate/vsynth1-msmpeg4.avi
 -5ca72c39e3fc5df8e62f223c869589f5 *tests/data/fate/vsynth1-msmpeg4.out.rawvideo
++7d9d622b04156246348bde2e3a4d9c9c *tests/data/fate/vsynth1-msmpeg4.avi
++624702 tests/data/fate/vsynth1-msmpeg4.avi
 +4529fee96b8073e02974f5355e5f6c4e *tests/data/fate/vsynth1-msmpeg4.out.rawvideo
  stddev:    7.98 PSNR: 30.09 MAXDIFF:  104 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-msmpeg4v2
index ff54534,fb9862c..775d575
--- 1/tests/ref/fate/vsynth1-msmpeg4v2
--- 2/tests/ref/fate/vsynth1-msmpeg4v2
+++ b/tests/ref/fate/vsynth1-msmpeg4v2
@@@ -1,4 -1,4 +1,4 @@@
- 6fbce2ce8618cf8c4c19897188eb1ca0 *tests/data/fate/vsynth1-msmpeg4v2.avi
- 623778 tests/data/fate/vsynth1-msmpeg4v2.avi
 -48c76c638b43ee53bde9c58185b25e80 *tests/data/fate/vsynth1-msmpeg4v2.avi
 -623776 tests/data/fate/vsynth1-msmpeg4v2.avi
 -c6ff1041a0ef62c2a2e5ef519e5e94c4 *tests/data/fate/vsynth1-msmpeg4v2.out.rawvideo
++a0539692d72e763448fc0dbe98d92ea3 *tests/data/fate/vsynth1-msmpeg4v2.avi
++623766 tests/data/fate/vsynth1-msmpeg4v2.avi
 +0476d9aafc4358654f411fa9648f9560 *tests/data/fate/vsynth1-msmpeg4v2.out.rawvideo
  stddev:    7.97 PSNR: 30.10 MAXDIFF:  105 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-msvideo1
index 46022b6,0000000..0ab8860
mode 100644,000000..100644
--- 1/tests/ref/fate/vsynth1-msvideo1
--- /dev/null
+++ b/tests/ref/fate/vsynth1-msvideo1
@@@ -1,4 -1,0 +1,4 @@@
- 75a0f6680e23a50477826caec1a41bb9 *tests/data/fate/vsynth1-msvideo1.avi
- 2051904 tests/data/fate/vsynth1-msvideo1.avi
++bea8dd62e64453fb08e4f3d19be23792 *tests/data/fate/vsynth1-msvideo1.avi
++2051892 tests/data/fate/vsynth1-msvideo1.avi
 +f4605ac6df556a3ca7053c49aaac04d8 *tests/data/fate/vsynth1-msvideo1.out.rawvideo
 +stddev:   11.89 PSNR: 26.62 MAXDIFF:  159 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-r210
index 68cdac8,0000000..15b56a2
mode 100644,000000..100644
--- 1/tests/ref/fate/vsynth1-r210
--- /dev/null
+++ b/tests/ref/fate/vsynth1-r210
@@@ -1,4 -1,0 +1,4 @@@
- 604a34c9f9151891c2d63d2652b75329 *tests/data/fate/vsynth1-r210.avi
- 22125260 tests/data/fate/vsynth1-r210.avi
++80c966b18025897207ab624206a6e7a0 *tests/data/fate/vsynth1-r210.avi
++22125248 tests/data/fate/vsynth1-r210.avi
 +ecaafa9eec11b5e1453a63ed6d194eed *tests/data/fate/vsynth1-r210.out.rawvideo
 +stddev:    3.23 PSNR: 37.94 MAXDIFF:   48 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-rgb
index 94e11e9,f72b737..3db3348
--- 1/tests/ref/fate/vsynth1-rgb
--- 2/tests/ref/fate/vsynth1-rgb
+++ b/tests/ref/fate/vsynth1-rgb
@@@ -1,4 -1,4 +1,4 @@@
- 05f0719cb52486d9a4beb9cfae3f2571 *tests/data/fate/vsynth1-rgb.avi
- 15213260 tests/data/fate/vsynth1-rgb.avi
+ d78bcd5828862c3342388ec8a2c34fef *tests/data/fate/vsynth1-rgb.avi
+ 15213248 tests/data/fate/vsynth1-rgb.avi
 -243325fb2cae1a9245efd49aff936327 *tests/data/fate/vsynth1-rgb.out.rawvideo
 -stddev:    3.42 PSNR: 37.43 MAXDIFF:   48 bytes:  7603200/  7603200
 +93695a27c24a61105076ca7b1f010bbd *tests/data/fate/vsynth1-rgb.out.rawvideo
 +stddev:    3.42 PSNR: 37.44 MAXDIFF:   48 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-v308
index 137dcf9,0000000..7dc5de9
mode 100644,000000..100644
--- 1/tests/ref/fate/vsynth1-v308
--- /dev/null
+++ b/tests/ref/fate/vsynth1-v308
@@@ -1,4 -1,0 +1,4 @@@
- 8d5f2065ce6547acc51041a679b7d6c4 *tests/data/fate/vsynth1-v308.avi
- 15213260 tests/data/fate/vsynth1-v308.avi
++05552ba36d003f8d5fec739c5ed90a67 *tests/data/fate/vsynth1-v308.avi
++15213248 tests/data/fate/vsynth1-v308.avi
 +10fb42f1abf40a289c3edafc0390482c *tests/data/fate/vsynth1-v308.out.rawvideo
 +stddev:    2.67 PSNR: 39.60 MAXDIFF:   43 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-v408
index c7f414c,0000000..f1523d1
mode 100644,000000..100644
--- 1/tests/ref/fate/vsynth1-v408
--- /dev/null
+++ b/tests/ref/fate/vsynth1-v408
@@@ -1,4 -1,0 +1,4 @@@
- 98057c4d5ce12a1b1b3ca15839f47c95 *tests/data/fate/vsynth1-v408.avi
- 20282060 tests/data/fate/vsynth1-v408.avi
++415c94a79b0eb58c445221a362e0054e *tests/data/fate/vsynth1-v408.avi
++20282048 tests/data/fate/vsynth1-v408.avi
 +c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-v408.out.rawvideo
 +stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-wmv1
index 9afc020,78bd0f0..8d24543
--- 1/tests/ref/fate/vsynth1-wmv1
--- 2/tests/ref/fate/vsynth1-wmv1
+++ b/tests/ref/fate/vsynth1-wmv1
@@@ -1,4 -1,4 +1,4 @@@
- 8c406d0253bd474d4764f5d75776fc03 *tests/data/fate/vsynth1-wmv1.avi
- 626882 tests/data/fate/vsynth1-wmv1.avi
 -5f896b2c7d6a0906f5252a5088fbc64a *tests/data/fate/vsynth1-wmv1.avi
 -626896 tests/data/fate/vsynth1-wmv1.avi
 -5182edba5b5e0354b39ce4f3604b62da *tests/data/fate/vsynth1-wmv1.out.rawvideo
++2760d19cb77d84bd5bfc588d23306113 *tests/data/fate/vsynth1-wmv1.avi
++626870 tests/data/fate/vsynth1-wmv1.avi
 +3354066ebdd8cd8098394be2384744e7 *tests/data/fate/vsynth1-wmv1.out.rawvideo
  stddev:    7.97 PSNR: 30.09 MAXDIFF:  110 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-wmv2
index 6ce5520,82efc62..79a1302
--- 1/tests/ref/fate/vsynth1-wmv2
--- 2/tests/ref/fate/vsynth1-wmv2
+++ b/tests/ref/fate/vsynth1-wmv2
@@@ -1,4 -1,4 +1,4 @@@
- 916932bf4b81443b4b87128ba8b63580 *tests/data/fate/vsynth1-wmv2.avi
- 659844 tests/data/fate/vsynth1-wmv2.avi
 -fc0796c6c49a18034cef008d61c0d964 *tests/data/fate/vsynth1-wmv2.avi
 -659840 tests/data/fate/vsynth1-wmv2.avi
 -5182edba5b5e0354b39ce4f3604b62da *tests/data/fate/vsynth1-wmv2.out.rawvideo
++532f99495482015c12a2773ec1065a4d *tests/data/fate/vsynth1-wmv2.avi
++659832 tests/data/fate/vsynth1-wmv2.avi
 +3354066ebdd8cd8098394be2384744e7 *tests/data/fate/vsynth1-wmv2.out.rawvideo
  stddev:    7.97 PSNR: 30.09 MAXDIFF:  110 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-y41p
index d2147f6,0000000..93fa938
mode 100644,000000..100644
--- 1/tests/ref/fate/vsynth1-y41p
--- /dev/null
+++ b/tests/ref/fate/vsynth1-y41p
@@@ -1,4 -1,0 +1,4 @@@
- 70bbcb52acac0a3cb3217719669a8242 *tests/data/fate/vsynth1-y41p.avi
- 7610060 tests/data/fate/vsynth1-y41p.avi
++c9fce228075067c51511d8b070fde340 *tests/data/fate/vsynth1-y41p.avi
++7610048 tests/data/fate/vsynth1-y41p.avi
 +3aef1d83732a3f9835ee2523a11c95c1 *tests/data/fate/vsynth1-y41p.out.rawvideo
 +stddev:    5.98 PSNR: 32.59 MAXDIFF:   87 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-yuv
index 5dc29aa,3db5ab0..2eeff80
--- 1/tests/ref/fate/vsynth1-yuv
--- 2/tests/ref/fate/vsynth1-yuv
+++ b/tests/ref/fate/vsynth1-yuv
@@@ -1,4 -1,4 +1,4 @@@
- eaa66c3b27a2602e882befe154a8b119 *tests/data/fate/vsynth1-yuv.avi
- 7610060 tests/data/fate/vsynth1-yuv.avi
 -a9c708ba20f5c562fb1c89f6aa841c8c *tests/data/fate/vsynth1-yuv.avi
++9622cbbe3ced7490f50e74cf088bc7c9 *tests/data/fate/vsynth1-yuv.avi
+ 7610048 tests/data/fate/vsynth1-yuv.avi
  c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-yuv.out.rawvideo
  stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-yuv4
index 5b7b925,0000000..5c473a2
mode 100644,000000..100644
--- 1/tests/ref/fate/vsynth1-yuv4
--- /dev/null
+++ b/tests/ref/fate/vsynth1-yuv4
@@@ -1,4 -1,0 +1,4 @@@
- e0d593eb635432f421b93224e425ee03 *tests/data/fate/vsynth1-yuv4.avi
- 7610060 tests/data/fate/vsynth1-yuv4.avi
++45805be52d9807f0c6f76011a64bf67b *tests/data/fate/vsynth1-yuv4.avi
++7610048 tests/data/fate/vsynth1-yuv4.avi
 +c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-yuv4.out.rawvideo
 +stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth1-zlib
index 068f154,0000000..afd9030
mode 100644,000000..100644
--- 1/tests/ref/fate/vsynth1-zlib
--- /dev/null
+++ b/tests/ref/fate/vsynth1-zlib
@@@ -1,4 -1,0 +1,4 @@@
- fe4983e551b48dc555e1aeaf628f649f *tests/data/fate/vsynth1-zlib.avi
- 12108644 tests/data/fate/vsynth1-zlib.avi
++1aa8c91588a9672b6adb63b98156a104 *tests/data/fate/vsynth1-zlib.avi
++12108632 tests/data/fate/vsynth1-zlib.avi
 +93695a27c24a61105076ca7b1f010bbd *tests/data/fate/vsynth1-zlib.out.rawvideo
 +stddev:    3.42 PSNR: 37.44 MAXDIFF:   48 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-amv
index 313edac,0000000..6937df3
mode 100644,000000..100644
--- 1/tests/ref/fate/vsynth2-amv
--- /dev/null
+++ b/tests/ref/fate/vsynth2-amv
@@@ -1,4 -1,0 +1,4 @@@
- 853ae9d6426cb3c4d4bad3592e1a2ec3 *tests/data/fate/vsynth2-amv.avi
- 761988 tests/data/fate/vsynth2-amv.avi
++26d039bc37b2186d57522a8e3dc76217 *tests/data/fate/vsynth2-amv.avi
++761976 tests/data/fate/vsynth2-amv.avi
 +f256ad9feefb499c6569d06d868eb496 *tests/data/fate/vsynth2-amv.out.rawvideo
 +stddev:    4.30 PSNR: 35.46 MAXDIFF:   65 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-cljr
index ae13185,39c74c3..c93da2e
--- 1/tests/ref/fate/vsynth2-cljr
--- 2/tests/ref/fate/vsynth2-cljr
+++ b/tests/ref/fate/vsynth2-cljr
@@@ -1,4 -1,4 +1,4 @@@
- fdc1926e0a599de94513f0a3472b598f *tests/data/fate/vsynth2-cljr.avi
- 5075660 tests/data/fate/vsynth2-cljr.avi
 -5745ff1d80a6f454ae448dcf0bce50e0 *tests/data/fate/vsynth2-cljr.avi
++d9da8b1a1e78a8f0438d37c10f975ba3 *tests/data/fate/vsynth2-cljr.avi
+ 5075648 tests/data/fate/vsynth2-cljr.avi
 -cfe7802bf34aafed7df5dcaa5126ef23 *tests/data/fate/vsynth2-cljr.out.rawvideo
 -stddev:    3.69 PSNR: 36.78 MAXDIFF:   22 bytes:  7603200/  7603200
 +965c4a134144b30b24d6d138b03ddb8c *tests/data/fate/vsynth2-cljr.out.rawvideo
 +stddev:    3.29 PSNR: 37.76 MAXDIFF:   23 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-ffvhuff
index ac58147,8daed2b..164e773
--- 1/tests/ref/fate/vsynth2-ffvhuff
--- 2/tests/ref/fate/vsynth2-ffvhuff
+++ b/tests/ref/fate/vsynth2-ffvhuff
@@@ -1,4 -1,4 +1,4 @@@
- 63926d8835dd5779dca0a4bc081ca8ae *tests/data/fate/vsynth2-ffvhuff.avi
- 4988056 tests/data/fate/vsynth2-ffvhuff.avi
 -f6a213ef136012a3d189d09468d80dd3 *tests/data/fate/vsynth2-ffvhuff.avi
++6689843a60dcc046fe1d7be3afab2cab *tests/data/fate/vsynth2-ffvhuff.avi
+ 4988044 tests/data/fate/vsynth2-ffvhuff.avi
  dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth2-ffvhuff.out.rawvideo
  stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-h261
index 375c5c6,71ea191..f9091c7
--- 1/tests/ref/fate/vsynth2-h261
--- 2/tests/ref/fate/vsynth2-h261
+++ b/tests/ref/fate/vsynth2-h261
@@@ -1,4 -1,4 +1,4 @@@
- 3a11ad7fb9e953041f40d0e8fd0ff278 *tests/data/fate/vsynth2-h261.avi
- 191072 tests/data/fate/vsynth2-h261.avi
 -921e06dffd04667d336449c7cd1c6589 *tests/data/fate/vsynth2-h261.avi
 -191074 tests/data/fate/vsynth2-h261.avi
 -db7ceff174823b98834faa2320ca89ac *tests/data/fate/vsynth2-h261.out.rawvideo
++dc32bc8a9e6eae15362ab86f8156f96a *tests/data/fate/vsynth2-h261.avi
++191060 tests/data/fate/vsynth2-h261.avi
 +08f65e9aeeeaf189548c2bb417d5114f *tests/data/fate/vsynth2-h261.out.rawvideo
  stddev:    6.37 PSNR: 32.03 MAXDIFF:   77 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-h263
index 47c86c5,b2ce370..944d8ea
--- 1/tests/ref/fate/vsynth2-h263
--- 2/tests/ref/fate/vsynth2-h263
+++ b/tests/ref/fate/vsynth2-h263
@@@ -1,4 -1,4 +1,4 @@@
- dc956aec267ebed753c1284847f62e2e *tests/data/fate/vsynth2-h263.avi
- 160114 tests/data/fate/vsynth2-h263.avi
 -329c0318b8727d66946ec729c6e960fc *tests/data/fate/vsynth2-h263.avi
 -160094 tests/data/fate/vsynth2-h263.avi
 -61213b91b359697ebcefb9e0a53ac54a *tests/data/fate/vsynth2-h263.out.rawvideo
++949d8c9926914751af5f433af0f8fd65 *tests/data/fate/vsynth2-h263.avi
++160102 tests/data/fate/vsynth2-h263.avi
 +b7d733ebedbaa04f49bf7493a907e223 *tests/data/fate/vsynth2-h263.out.rawvideo
  stddev:    5.43 PSNR: 33.42 MAXDIFF:   77 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-h263-obmc
index d8a65db,67fd2fd..a704318
--- 1/tests/ref/fate/vsynth2-h263-obmc
--- 2/tests/ref/fate/vsynth2-h263-obmc
+++ b/tests/ref/fate/vsynth2-h263-obmc
@@@ -1,4 -1,4 +1,4 @@@
- 482d48074d94ed72b0c7057b9c129b45 *tests/data/fate/vsynth2-h263-obmc.avi
- 154738 tests/data/fate/vsynth2-h263-obmc.avi
 -3abbe86e18ef9d407cc3817dd31ebeba *tests/data/fate/vsynth2-h263-obmc.avi
 -154716 tests/data/fate/vsynth2-h263-obmc.avi
 -6f326547cf1cbd95a8c0a5ddce9eb71a *tests/data/fate/vsynth2-h263-obmc.out.rawvideo
++7825a0bdf024673da2371829e3f01cc3 *tests/data/fate/vsynth2-h263-obmc.avi
++154726 tests/data/fate/vsynth2-h263-obmc.avi
 +588d992d9d8096da8bdc5027268da914 *tests/data/fate/vsynth2-h263-obmc.out.rawvideo
  stddev:    5.39 PSNR: 33.49 MAXDIFF:   82 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-h263p
index 2920d7a,826dcd1..b4ebed9
--- 1/tests/ref/fate/vsynth2-h263p
--- 2/tests/ref/fate/vsynth2-h263p
+++ b/tests/ref/fate/vsynth2-h263p
@@@ -1,4 -1,4 +1,4 @@@
- 628d3df9dad01c2da648f4cdc31ef62d *tests/data/fate/vsynth2-h263p.avi
- 868010 tests/data/fate/vsynth2-h263p.avi
 -865ca965ab4fdfe225db7de3d23b4ad8 *tests/data/fate/vsynth2-h263p.avi
 -868006 tests/data/fate/vsynth2-h263p.avi
 -4b0ee791f280029dc03c528f76f195d4 *tests/data/fate/vsynth2-h263p.out.rawvideo
++3894234818ed65426b5f20f058d27c73 *tests/data/fate/vsynth2-h263p.avi
++867998 tests/data/fate/vsynth2-h263p.avi
 +dca18571c05c13dd691d7b0b232e43fc *tests/data/fate/vsynth2-h263p.out.rawvideo
  stddev:    1.91 PSNR: 42.50 MAXDIFF:   19 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-huffyuv
index d94cbd6,7d062dd..9b67815
--- 1/tests/ref/fate/vsynth2-huffyuv
--- 2/tests/ref/fate/vsynth2-huffyuv
+++ b/tests/ref/fate/vsynth2-huffyuv
@@@ -1,4 -1,4 +1,4 @@@
- ed66182be0d515e8b6cb970ad63162da *tests/data/fate/vsynth2-huffyuv.avi
- 6455232 tests/data/fate/vsynth2-huffyuv.avi
 -30d509aca4a7298cf7667581a5e37671 *tests/data/fate/vsynth2-huffyuv.avi
++b5ae95ae03856ee14bbd38784a02f3ca *tests/data/fate/vsynth2-huffyuv.avi
+ 6455220 tests/data/fate/vsynth2-huffyuv.avi
  dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth2-huffyuv.out.rawvideo
  stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-j2k
index 1ad4482,0000000..4f038fe
mode 100644,000000..100644
--- 1/tests/ref/fate/vsynth2-j2k
--- /dev/null
+++ b/tests/ref/fate/vsynth2-j2k
@@@ -1,4 -1,0 +1,4 @@@
- b30dc1851c0fb37726d977ec1d5ad527 *tests/data/fate/vsynth2-j2k.avi
- 1151156 tests/data/fate/vsynth2-j2k.avi
++fc49816ba28731689872f5c87ca91c10 *tests/data/fate/vsynth2-j2k.avi
++1151144 tests/data/fate/vsynth2-j2k.avi
 +ec5218eec33a021945c28c72093382a5 *tests/data/fate/vsynth2-j2k.out.rawvideo
 +stddev:    4.54 PSNR: 34.99 MAXDIFF:   61 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-jpegls
index 728d54f,75ad403..f8f7081
--- 1/tests/ref/fate/vsynth2-jpegls
--- 2/tests/ref/fate/vsynth2-jpegls
+++ b/tests/ref/fate/vsynth2-jpegls
@@@ -1,4 -1,4 +1,4 @@@
- 8a94dc94b6df8bdde9a639246351d816 *tests/data/fate/vsynth2-jpegls.avi
- 8334630 tests/data/fate/vsynth2-jpegls.avi
+ f34315ed0e30cf4d94dd21ff1d4cea1b *tests/data/fate/vsynth2-jpegls.avi
+ 8334618 tests/data/fate/vsynth2-jpegls.avi
 -592b3321994e26a990deb3a0a1415de9 *tests/data/fate/vsynth2-jpegls.out.rawvideo
 -stddev:    0.65 PSNR: 51.84 MAXDIFF:   14 bytes:  7603200/  7603200
 +3a984506f1ebfc9fb73b6814cab201cc *tests/data/fate/vsynth2-jpegls.out.rawvideo
 +stddev:    0.66 PSNR: 51.73 MAXDIFF:   14 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-mjpeg
index c823c42,981d01b..f1780c5
--- 1/tests/ref/fate/vsynth2-mjpeg
--- 2/tests/ref/fate/vsynth2-mjpeg
+++ b/tests/ref/fate/vsynth2-mjpeg
@@@ -1,4 -1,4 +1,4 @@@
- fb05e46b8c69ad1f00d3d15cf4be6cee *tests/data/fate/vsynth2-mjpeg.avi
- 673186 tests/data/fate/vsynth2-mjpeg.avi
 -ba05f4fad7f34a96c77964e8cdf9d5c0 *tests/data/fate/vsynth2-mjpeg.avi
 -673212 tests/data/fate/vsynth2-mjpeg.avi
 -a96a4e15ffcb13e44360df642d049496 *tests/data/fate/vsynth2-mjpeg.out.rawvideo
++302197cccebb4d9797a08d06ca189533 *tests/data/fate/vsynth2-mjpeg.avi
++673174 tests/data/fate/vsynth2-mjpeg.avi
 +9d4bd90e9abfa18192383b4adc23c8d4 *tests/data/fate/vsynth2-mjpeg.out.rawvideo
  stddev:    4.32 PSNR: 35.40 MAXDIFF:   49 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-mpeg4-adap
index 0209cce,fb4c206..175552d
--- 1/tests/ref/fate/vsynth2-mpeg4-adap
--- 2/tests/ref/fate/vsynth2-mpeg4-adap
+++ b/tests/ref/fate/vsynth2-mpeg4-adap
@@@ -1,4 -1,4 +1,4 @@@
- d1683da1db86ec4365a9629ca764951f *tests/data/fate/vsynth2-mpeg4-adap.avi
- 198508 tests/data/fate/vsynth2-mpeg4-adap.avi
 -76c8962b06b7a0d748bd7eb3f6fc0e18 *tests/data/fate/vsynth2-mpeg4-adap.avi
 -198498 tests/data/fate/vsynth2-mpeg4-adap.avi
 -4affb83f6adc94f31024b4f9e0168945 *tests/data/fate/vsynth2-mpeg4-adap.out.rawvideo
++4b39d46a436f1bce59e2902cec3478e9 *tests/data/fate/vsynth2-mpeg4-adap.avi
++198496 tests/data/fate/vsynth2-mpeg4-adap.avi
 +87b6dbe98d276137fceaae2fa672eced *tests/data/fate/vsynth2-mpeg4-adap.out.rawvideo
  stddev:    3.75 PSNR: 36.65 MAXDIFF:   71 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-mpeg4-error
index eb9fc37,35dd03d..c6a2218
--- 1/tests/ref/fate/vsynth2-mpeg4-error
--- 2/tests/ref/fate/vsynth2-mpeg4-error
+++ b/tests/ref/fate/vsynth2-mpeg4-error
@@@ -1,4 -1,4 +1,4 @@@
- ee46af7cbbb9c7c03311e2143190fb20 *tests/data/fate/vsynth2-mpeg4-error.avi
- 180376 tests/data/fate/vsynth2-mpeg4-error.avi
 -d3025e5f784efeb2ab9b84f8924eda19 *tests/data/fate/vsynth2-mpeg4-error.avi
 -176576 tests/data/fate/vsynth2-mpeg4-error.avi
 -96baa9e4c24c837a3ba5abd8dd2cdd30 *tests/data/fate/vsynth2-mpeg4-error.out.rawvideo
 -stddev:    8.98 PSNR: 29.06 MAXDIFF:  184 bytes:  7603200/  7603200
++599a21c149a150072db364298dbcdda2 *tests/data/fate/vsynth2-mpeg4-error.avi
++180364 tests/data/fate/vsynth2-mpeg4-error.avi
 +4537ba5320f1ae0971cc6e329c366776 *tests/data/fate/vsynth2-mpeg4-error.out.rawvideo
 +stddev:    7.65 PSNR: 30.45 MAXDIFF:  158 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-mpeg4-nr
index 0a1194a,7fdce67..45db4b6
--- 1/tests/ref/fate/vsynth2-mpeg4-nr
--- 2/tests/ref/fate/vsynth2-mpeg4-nr
+++ b/tests/ref/fate/vsynth2-mpeg4-nr
@@@ -1,4 -1,4 +1,4 @@@
- a42042b1a2d3f4577d6293fc0dd077cb *tests/data/fate/vsynth2-mpeg4-nr.avi
- 155006 tests/data/fate/vsynth2-mpeg4-nr.avi
 -75725f3c2a08efa145a2692a20373a21 *tests/data/fate/vsynth2-mpeg4-nr.avi
 -155032 tests/data/fate/vsynth2-mpeg4-nr.avi
 -f7fc191308679f709405e62271f5c65f *tests/data/fate/vsynth2-mpeg4-nr.out.rawvideo
++e1cf863ec6c0a4975d49326df63342ca *tests/data/fate/vsynth2-mpeg4-nr.avi
++154994 tests/data/fate/vsynth2-mpeg4-nr.avi
 +d89cd5d0b1707f48fa9c4747c66d2d56 *tests/data/fate/vsynth2-mpeg4-nr.out.rawvideo
  stddev:    4.73 PSNR: 34.63 MAXDIFF:   64 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-mpeg4-qpel
index 0869eda,cab264a..8705bd5
--- 1/tests/ref/fate/vsynth2-mpeg4-qpel
--- 2/tests/ref/fate/vsynth2-mpeg4-qpel
+++ b/tests/ref/fate/vsynth2-mpeg4-qpel
@@@ -1,4 -1,4 +1,4 @@@
- 0e0aaf9c114eb8c60a4083b8a98ea7c7 *tests/data/fate/vsynth2-mpeg4-qpel.avi
- 163674 tests/data/fate/vsynth2-mpeg4-qpel.avi
 -c45101c6c3b681f5d420a938c0689a37 *tests/data/fate/vsynth2-mpeg4-qpel.avi
 -163676 tests/data/fate/vsynth2-mpeg4-qpel.avi
 -26dc7c78955fa678fbf150e236eb5627 *tests/data/fate/vsynth2-mpeg4-qpel.out.rawvideo
++b36ad1ca7ac6e1aff6d69b8df4386011 *tests/data/fate/vsynth2-mpeg4-qpel.avi
++163662 tests/data/fate/vsynth2-mpeg4-qpel.avi
 +e2ce994dbb66da51c2e1ad26617d7c2f *tests/data/fate/vsynth2-mpeg4-qpel.out.rawvideo
  stddev:    3.97 PSNR: 36.14 MAXDIFF:   54 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-mpeg4-qprd
index 8e69b3e,1779dd7..1bbda29
--- 1/tests/ref/fate/vsynth2-mpeg4-qprd
--- 2/tests/ref/fate/vsynth2-mpeg4-qprd
+++ b/tests/ref/fate/vsynth2-mpeg4-qprd
@@@ -1,4 -1,4 +1,4 @@@
- 5aca88f3b6036515a1cdd41647395dc2 *tests/data/fate/vsynth2-mpeg4-qprd.avi
- 231462 tests/data/fate/vsynth2-mpeg4-qprd.avi
 -81afd85c3ab00b685588e1b61cc3e4b3 *tests/data/fate/vsynth2-mpeg4-qprd.avi
 -231446 tests/data/fate/vsynth2-mpeg4-qprd.avi
 -de8a883865e2dff7a51f66da6c48df48 *tests/data/fate/vsynth2-mpeg4-qprd.out.rawvideo
++ee24ddde5e3c06a6c44093a59e7ac413 *tests/data/fate/vsynth2-mpeg4-qprd.avi
++231450 tests/data/fate/vsynth2-mpeg4-qprd.avi
 +3071250e0864546c2455c9f9c9b8604e *tests/data/fate/vsynth2-mpeg4-qprd.out.rawvideo
  stddev:    3.71 PSNR: 36.72 MAXDIFF:   61 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-mpeg4-rc
index 4401f92,74e7962..2a26a16
--- 1/tests/ref/fate/vsynth2-mpeg4-rc
--- 2/tests/ref/fate/vsynth2-mpeg4-rc
+++ b/tests/ref/fate/vsynth2-mpeg4-rc
@@@ -1,4 -1,4 +1,4 @@@
- 8e4101a166eee52093ed687c62764d5e *tests/data/fate/vsynth2-mpeg4-rc.avi
- 226322 tests/data/fate/vsynth2-mpeg4-rc.avi
 -e3621649079539ec118e8581c54bc2ef *tests/data/fate/vsynth2-mpeg4-rc.avi
 -226320 tests/data/fate/vsynth2-mpeg4-rc.avi
 -2b34e606af895b62a250de98749a19b0 *tests/data/fate/vsynth2-mpeg4-rc.out.rawvideo
++20028333988bb7a0888a79799ea63b19 *tests/data/fate/vsynth2-mpeg4-rc.avi
++226310 tests/data/fate/vsynth2-mpeg4-rc.avi
 +6e8b62e8c3bcbfdcc58afb69a0b1c4e3 *tests/data/fate/vsynth2-mpeg4-rc.out.rawvideo
  stddev:    4.23 PSNR: 35.60 MAXDIFF:   85 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-mpeg4-thread
index 664f89e,61478a0..d8d87c4
--- 1/tests/ref/fate/vsynth2-mpeg4-thread
--- 2/tests/ref/fate/vsynth2-mpeg4-thread
+++ b/tests/ref/fate/vsynth2-mpeg4-thread
@@@ -1,4 -1,4 +1,4 @@@
- 9859aa7d322b639b07386980bc3f4797 *tests/data/fate/vsynth2-mpeg4-thread.avi
- 250104 tests/data/fate/vsynth2-mpeg4-thread.avi
 -69b716c9f99c5acb86a744521c32cf72 *tests/data/fate/vsynth2-mpeg4-thread.avi
 -250128 tests/data/fate/vsynth2-mpeg4-thread.avi
 -5355deb8c7609a3f1ff2173aab1dee70 *tests/data/fate/vsynth2-mpeg4-thread.out.rawvideo
++d50954ec2c64c2634d88ba1df879dde0 *tests/data/fate/vsynth2-mpeg4-thread.avi
++250092 tests/data/fate/vsynth2-mpeg4-thread.avi
 +045fe9f226bbcc3d41644bffaed03b31 *tests/data/fate/vsynth2-mpeg4-thread.out.rawvideo
  stddev:    3.69 PSNR: 36.78 MAXDIFF:   65 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-mpng
index fecdac8,0000000..2e6865c
mode 100644,000000..100644
--- 1/tests/ref/fate/vsynth2-mpng
--- /dev/null
+++ b/tests/ref/fate/vsynth2-mpng
@@@ -1,4 -1,0 +1,4 @@@
- 777cee2a95de980bc63861c9093ba908 *tests/data/fate/vsynth2-mpng.avi
- 12558342 tests/data/fate/vsynth2-mpng.avi
++b8f9aa584da89837058c96fc5c3a6562 *tests/data/fate/vsynth2-mpng.avi
++12558330 tests/data/fate/vsynth2-mpng.avi
 +98d0e2854731472c5bf13d8638502d0a *tests/data/fate/vsynth2-mpng.out.rawvideo
 +stddev:    1.26 PSNR: 46.10 MAXDIFF:   13 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-msmpeg4
index 0656101,a7cc94e..274cecc
--- 1/tests/ref/fate/vsynth2-msmpeg4
--- 2/tests/ref/fate/vsynth2-msmpeg4
+++ b/tests/ref/fate/vsynth2-msmpeg4
@@@ -1,4 -1,4 +1,4 @@@
- cc347c58bf116cdb09b0ce1d549fa989 *tests/data/fate/vsynth2-msmpeg4.avi
- 127672 tests/data/fate/vsynth2-msmpeg4.avi
 -f602d25096c83f166bdab01fa07a34c1 *tests/data/fate/vsynth2-msmpeg4.avi
 -127668 tests/data/fate/vsynth2-msmpeg4.avi
 -0e1c6e25c71c6a8fa8e506e3d97ca4c9 *tests/data/fate/vsynth2-msmpeg4.out.rawvideo
 -stddev:    5.33 PSNR: 33.59 MAXDIFF:   78 bytes:  7603200/  7603200
++6eb2a9770c223636befacfba83f72c44 *tests/data/fate/vsynth2-msmpeg4.avi
++127660 tests/data/fate/vsynth2-msmpeg4.avi
 +bb14902d5850d6b0ab70fdb017855775 *tests/data/fate/vsynth2-msmpeg4.out.rawvideo
 +stddev:    5.33 PSNR: 33.58 MAXDIFF:   78 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-msmpeg4v2
index fe9cc4c,542dfe5..a851a2f
--- 1/tests/ref/fate/vsynth2-msmpeg4v2
--- 2/tests/ref/fate/vsynth2-msmpeg4v2
+++ b/tests/ref/fate/vsynth2-msmpeg4v2
@@@ -1,4 -1,4 +1,4 @@@
- dc94a157743f7439b15e69d6a0737b8a *tests/data/fate/vsynth2-msmpeg4v2.avi
- 129930 tests/data/fate/vsynth2-msmpeg4v2.avi
 -43d6ca9b63993b4603d4f08fa6aaeab3 *tests/data/fate/vsynth2-msmpeg4v2.avi
 -129906 tests/data/fate/vsynth2-msmpeg4v2.avi
 -8920194f8bf8f9cdd6c65b3df9e1a292 *tests/data/fate/vsynth2-msmpeg4v2.out.rawvideo
 -stddev:    5.33 PSNR: 33.59 MAXDIFF:   80 bytes:  7603200/  7603200
++e0929f2cebefc9f6259870b806829de3 *tests/data/fate/vsynth2-msmpeg4v2.avi
++129918 tests/data/fate/vsynth2-msmpeg4v2.avi
 +537c114e1d47c54a4bccd31f4073e9bd *tests/data/fate/vsynth2-msmpeg4v2.out.rawvideo
 +stddev:    5.33 PSNR: 33.59 MAXDIFF:   79 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-msvideo1
index 77d8cea,0000000..a915c13
mode 100644,000000..100644
--- 1/tests/ref/fate/vsynth2-msvideo1
--- /dev/null
+++ b/tests/ref/fate/vsynth2-msvideo1
@@@ -1,4 -1,0 +1,4 @@@
- 8d7e8eb05771d0341d88c30892908960 *tests/data/fate/vsynth2-msvideo1.avi
- 914572 tests/data/fate/vsynth2-msvideo1.avi
++6c1709d61202ec2e73b467e76cb79f9b *tests/data/fate/vsynth2-msvideo1.avi
++914560 tests/data/fate/vsynth2-msvideo1.avi
 +9a6ac7c0171286f009d159b59fdc1154 *tests/data/fate/vsynth2-msvideo1.out.rawvideo
 +stddev:    7.97 PSNR: 30.10 MAXDIFF:  123 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-r210
index 610ba2c,0000000..a91c12a
mode 100644,000000..100644
--- 1/tests/ref/fate/vsynth2-r210
--- /dev/null
+++ b/tests/ref/fate/vsynth2-r210
@@@ -1,4 -1,0 +1,4 @@@
- d7a6f298e6869a74c0988fc3b30d0351 *tests/data/fate/vsynth2-r210.avi
- 22125260 tests/data/fate/vsynth2-r210.avi
++4568992c4f5562be06374519a419d3a3 *tests/data/fate/vsynth2-r210.avi
++22125248 tests/data/fate/vsynth2-r210.avi
 +6ea4fcd93fc83defc8770e85b64b60bb *tests/data/fate/vsynth2-r210.out.rawvideo
 +stddev:    0.70 PSNR: 51.12 MAXDIFF:   12 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-rgb
index c89f46f,5c9a98e..6f5169d
--- 1/tests/ref/fate/vsynth2-rgb
--- 2/tests/ref/fate/vsynth2-rgb
+++ b/tests/ref/fate/vsynth2-rgb
@@@ -1,4 -1,4 +1,4 @@@
- f2e9c419023c743bf99aa5b2e55ad233 *tests/data/fate/vsynth2-rgb.avi
- 15213260 tests/data/fate/vsynth2-rgb.avi
+ 01199075994e44f282fbb6a8e3ccc668 *tests/data/fate/vsynth2-rgb.avi
+ 15213248 tests/data/fate/vsynth2-rgb.avi
 -b2418e0e3a9a8619b31219cbcf24dc82 *tests/data/fate/vsynth2-rgb.out.rawvideo
 -stddev:    1.26 PSNR: 46.06 MAXDIFF:   13 bytes:  7603200/  7603200
 +98d0e2854731472c5bf13d8638502d0a *tests/data/fate/vsynth2-rgb.out.rawvideo
 +stddev:    1.26 PSNR: 46.10 MAXDIFF:   13 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-v308
index cd20214,0000000..f7c46fc
mode 100644,000000..100644
--- 1/tests/ref/fate/vsynth2-v308
--- /dev/null
+++ b/tests/ref/fate/vsynth2-v308
@@@ -1,4 -1,0 +1,4 @@@
- 214671673e6c82bad8190d0329f01fdc *tests/data/fate/vsynth2-v308.avi
- 15213260 tests/data/fate/vsynth2-v308.avi
++aba17ed2860ac714da0e378ebe47e7bb *tests/data/fate/vsynth2-v308.avi
++15213248 tests/data/fate/vsynth2-v308.avi
 +d43cb310c130c69214332d74f6ee5f9a *tests/data/fate/vsynth2-v308.out.rawvideo
 +stddev:    0.41 PSNR: 55.80 MAXDIFF:    7 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-v408
index 8d12fc7,0000000..4c63dec
mode 100644,000000..100644
--- 1/tests/ref/fate/vsynth2-v408
--- /dev/null
+++ b/tests/ref/fate/vsynth2-v408
@@@ -1,4 -1,0 +1,4 @@@
- 033d112ec5a1a78882233d0b791e5ef7 *tests/data/fate/vsynth2-v408.avi
- 20282060 tests/data/fate/vsynth2-v408.avi
++d689d4a53081765f0fbc965554c06faa *tests/data/fate/vsynth2-v408.avi
++20282048 tests/data/fate/vsynth2-v408.avi
 +dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth2-v408.out.rawvideo
 +stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-wmv1
index 7eb0fe6,188b518..6e56b6f
--- 1/tests/ref/fate/vsynth2-wmv1
--- 2/tests/ref/fate/vsynth2-wmv1
+++ b/tests/ref/fate/vsynth2-wmv1
@@@ -1,4 -1,4 +1,4 @@@
- 0eef8e6c0bddcd7b60564e0dfcbcf461 *tests/data/fate/vsynth2-wmv1.avi
- 129522 tests/data/fate/vsynth2-wmv1.avi
 -73f3b72208ed1e61be60f1412dbf35e2 *tests/data/fate/vsynth2-wmv1.avi
 -129518 tests/data/fate/vsynth2-wmv1.avi
 -81eee429b665254d19a06607463c0b5e *tests/data/fate/vsynth2-wmv1.out.rawvideo
++dc2affb9b9a95a09dd69c25c75c50174 *tests/data/fate/vsynth2-wmv1.avi
++129510 tests/data/fate/vsynth2-wmv1.avi
 +dec44e3c04db4fef49a7728f164d9159 *tests/data/fate/vsynth2-wmv1.out.rawvideo
  stddev:    5.33 PSNR: 33.60 MAXDIFF:   77 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-wmv2
index 8d55a47,043dac9..41beb4e
--- 1/tests/ref/fate/vsynth2-wmv2
--- 2/tests/ref/fate/vsynth2-wmv2
+++ b/tests/ref/fate/vsynth2-wmv2
@@@ -1,4 -1,4 +1,4 @@@
- c68ca99473538064d9de3bdcc8f2e759 *tests/data/fate/vsynth2-wmv2.avi
- 129846 tests/data/fate/vsynth2-wmv2.avi
 -0760abea07c386ab956fa1bb8b14c599 *tests/data/fate/vsynth2-wmv2.avi
 -129848 tests/data/fate/vsynth2-wmv2.avi
 -81eee429b665254d19a06607463c0b5e *tests/data/fate/vsynth2-wmv2.out.rawvideo
++f2a29f4e98a526e104067ca381716e47 *tests/data/fate/vsynth2-wmv2.avi
++129834 tests/data/fate/vsynth2-wmv2.avi
 +dec44e3c04db4fef49a7728f164d9159 *tests/data/fate/vsynth2-wmv2.out.rawvideo
  stddev:    5.33 PSNR: 33.60 MAXDIFF:   77 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-y41p
index b310e3b,0000000..ac9d64a
mode 100644,000000..100644
--- 1/tests/ref/fate/vsynth2-y41p
--- /dev/null
+++ b/tests/ref/fate/vsynth2-y41p
@@@ -1,4 -1,0 +1,4 @@@
- 8e0139963e79180a0fc1c154e36cebe5 *tests/data/fate/vsynth2-y41p.avi
- 7610060 tests/data/fate/vsynth2-y41p.avi
++0689a7a5c4dd6ac6ac515b54d45d249e *tests/data/fate/vsynth2-y41p.avi
++7610048 tests/data/fate/vsynth2-y41p.avi
 +d27a84ccdac09055724d122e03fea82a *tests/data/fate/vsynth2-y41p.out.rawvideo
 +stddev:    1.07 PSNR: 47.54 MAXDIFF:   21 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-yuv
index e5409b0,d79e986..d6b8736
--- 1/tests/ref/fate/vsynth2-yuv
--- 2/tests/ref/fate/vsynth2-yuv
+++ b/tests/ref/fate/vsynth2-yuv
@@@ -1,4 -1,4 +1,4 @@@
- 3d5ee6d2023bc15bba898819e4977e46 *tests/data/fate/vsynth2-yuv.avi
- 7610060 tests/data/fate/vsynth2-yuv.avi
 -d08219372af7a764c1afbc99a1002fe0 *tests/data/fate/vsynth2-yuv.avi
++0029ade090172b34687cdc9163748e47 *tests/data/fate/vsynth2-yuv.avi
+ 7610048 tests/data/fate/vsynth2-yuv.avi
  dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth2-yuv.out.rawvideo
  stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-yuv4
index a5e9ee5,0000000..8fa347a
mode 100644,000000..100644
--- 1/tests/ref/fate/vsynth2-yuv4
--- /dev/null
+++ b/tests/ref/fate/vsynth2-yuv4
@@@ -1,4 -1,0 +1,4 @@@
- 3d24f1d320c4ead1efbf3c952a902379 *tests/data/fate/vsynth2-yuv4.avi
- 7610060 tests/data/fate/vsynth2-yuv4.avi
++00454056d8560cde37409e0b578209d8 *tests/data/fate/vsynth2-yuv4.avi
++7610048 tests/data/fate/vsynth2-yuv4.avi
 +dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth2-yuv4.out.rawvideo
 +stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200

diff --cc tests/ref/fate/vsynth2-zlib
index d3295e3,0000000..fc742db
mode 100644,000000..100644
--- 1/tests/ref/fate/vsynth2-zlib
--- /dev/null
+++ b/tests/ref/fate/vsynth2-zlib
@@@ -1,4 -1,0 +1,4 @@@
- f4bfa774c853abe8f06a29596c1f16cb *tests/data/fate/vsynth2-zlib.avi
- 12517188 tests/data/fate/vsynth2-zlib.avi
++fa60eac1bfbdf38c773d11d716eb6465 *tests/data/fate/vsynth2-zlib.avi
++12517176 tests/data/fate/vsynth2-zlib.avi
 +98d0e2854731472c5bf13d8638502d0a *tests/data/fate/vsynth2-zlib.out.rawvideo
 +stddev:    1.26 PSNR: 46.10 MAXDIFF:   13 bytes:  7603200/  7603200

diff --cc tests/ref/seek/h261_avi
index 55ccf97,1789adc..48ee00f
--- 1/tests/ref/seek/h261_avi
--- 2/tests/ref/seek/h261_avi
+++ b/tests/ref/seek/h261_avi
@@@ -1,46 -1,46 +1,46 @@@
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size:  9645
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  9645
  ret: 0         st:-1 flags:0  ts:-1.000000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size:  9645
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  9645
  ret: 0         st:-1 flags:1  ts: 1.894167
- ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 126506 size: 11377
 -ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 126502 size: 11377
++ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 126494 size: 11377
  ret: 0         st: 0 flags:0  ts: 0.800000
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  82064 size: 10322
 -ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  82060 size: 10322
++ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  82052 size: 10322
  ret:-1         st: 0 flags:1  ts:-0.320000
  ret:-1         st:-1 flags:0  ts: 2.576668
  ret: 0         st:-1 flags:1  ts: 1.470835
- ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 126506 size: 11377
 -ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 126502 size: 11377
++ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 126494 size: 11377
  ret: 0         st: 0 flags:0  ts: 0.360000
- ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  44676 size:  9404
 -ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  44666 size:  9404
++ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  44664 size:  9404
  ret:-1         st: 0 flags:1  ts:-0.760000
  ret:-1         st:-1 flags:0  ts: 2.153336
  ret: 0         st:-1 flags:1  ts: 1.047503
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  82064 size: 10322
 -ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  82060 size: 10322
++ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  82052 size: 10322
  ret: 0         st: 0 flags:0  ts:-0.040000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size:  9645
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  9645
  ret: 0         st: 0 flags:1  ts: 2.840000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 175868 size: 11707
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 175870 size: 11707
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 175856 size: 11707
  ret: 0         st:-1 flags:0  ts: 1.730004
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 175868 size: 11707
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 175870 size: 11707
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 175856 size: 11707
  ret: 0         st:-1 flags:1  ts: 0.624171
- ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  44676 size:  9404
 -ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  44666 size:  9404
++ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  44664 size:  9404
  ret: 0         st: 0 flags:0  ts:-0.480000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size:  9645
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  9645
  ret: 0         st: 0 flags:1  ts: 2.400000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 175868 size: 11707
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 175870 size: 11707
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 175856 size: 11707
  ret: 0         st:-1 flags:0  ts: 1.306672
- ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 126506 size: 11377
 -ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 126502 size: 11377
++ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 126494 size: 11377
  ret: 0         st:-1 flags:1  ts: 0.200839
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size:  9645
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  9645
  ret: 0         st: 0 flags:0  ts:-0.920000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size:  9645
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  9645
  ret: 0         st: 0 flags:1  ts: 2.000000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 175868 size: 11707
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 175870 size: 11707
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 175856 size: 11707
  ret: 0         st:-1 flags:0  ts: 0.883340
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  82064 size: 10322
 -ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  82060 size: 10322
++ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  82052 size: 10322
  ret:-1         st:-1 flags:1  ts:-0.222493
  ret:-1         st: 0 flags:0  ts: 2.680000
  ret: 0         st: 0 flags:1  ts: 1.560000
- ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 126506 size: 11377
 -ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 126502 size: 11377
++ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 126494 size: 11377
  ret: 0         st:-1 flags:0  ts: 0.460008
- ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  44676 size:  9404
 -ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  44666 size:  9404
++ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  44664 size:  9404
  ret:-1         st:-1 flags:1  ts:-0.645825

diff --cc tests/ref/seek/h263_avi
index c9f7908,b92074f..6b7df48
--- 1/tests/ref/seek/h263_avi
--- 2/tests/ref/seek/h263_avi
+++ b/tests/ref/seek/h263_avi
@@@ -14,29 -14,29 +14,29 @@@ ret: 0         st: 0 flags:1 dts: 0.480
  ret:-1         st: 0 flags:1  ts:-0.760000
  ret:-1         st:-1 flags:0  ts: 2.153336
  ret: 0         st:-1 flags:1  ts: 1.047503
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  66804 size: 11128
+ ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  66792 size: 11128
  ret: 0         st: 0 flags:0  ts:-0.040000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 10381
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 10381
  ret: 0         st: 0 flags:1  ts: 2.840000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 144564 size: 12731
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 144546 size: 12731
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 144552 size: 12731
  ret: 0         st:-1 flags:0  ts: 1.730004
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 144564 size: 12731
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 144546 size: 12731
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 144552 size: 12731
  ret: 0         st:-1 flags:1  ts: 0.624171
- ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  36450 size: 10090
+ ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  36438 size: 10090
  ret: 0         st: 0 flags:0  ts:-0.480000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 10381
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 10381
  ret: 0         st: 0 flags:1  ts: 2.400000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 144564 size: 12731
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 144546 size: 12731
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 144552 size: 12731
  ret: 0         st:-1 flags:0  ts: 1.306672
- ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 103714 size: 12296
+ ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 103702 size: 12296
  ret: 0         st:-1 flags:1  ts: 0.200839
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 10381
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 10381
  ret: 0         st: 0 flags:0  ts:-0.920000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 10381
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 10381
  ret: 0         st: 0 flags:1  ts: 2.000000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 144564 size: 12731
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 144546 size: 12731
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 144552 size: 12731
  ret: 0         st:-1 flags:0  ts: 0.883340
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  66804 size: 11128
+ ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  66792 size: 11128
  ret:-1         st:-1 flags:1  ts:-0.222493
  ret:-1         st: 0 flags:0  ts: 2.680000
  ret: 0         st: 0 flags:1  ts: 1.560000

diff --cc tests/ref/seek/h263p_avi
index 2756439,9d842a6..7dd4852
--- 1/tests/ref/seek/h263p_avi
--- 2/tests/ref/seek/h263p_avi
+++ b/tests/ref/seek/h263p_avi
@@@ -1,46 -1,46 +1,46 @@@
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 36208
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 36208
  ret: 0         st:-1 flags:0  ts:-1.000000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 36208
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 36208
  ret: 0         st:-1 flags:1  ts: 1.894167
- ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 569930 size: 45151
 -ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 569926 size: 45151
++ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 569918 size: 45151
  ret: 0         st: 0 flags:0  ts: 0.800000
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 355980 size: 40907
 -ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 355976 size: 40907
++ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 355968 size: 40907
  ret:-1         st: 0 flags:1  ts:-0.320000
  ret:-1         st:-1 flags:0  ts: 2.576668
  ret: 0         st:-1 flags:1  ts: 1.470835
- ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 569930 size: 45151
 -ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 569926 size: 45151
++ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 569918 size: 45151
  ret: 0         st: 0 flags:0  ts: 0.360000
- ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 171054 size: 36514
 -ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 171042 size: 36515
++ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 171042 size: 36514
  ret:-1         st: 0 flags:1  ts:-0.760000
  ret:-1         st:-1 flags:0  ts: 2.153336
  ret: 0         st:-1 flags:1  ts: 1.047503
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 355980 size: 40907
 -ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 355976 size: 40907
++ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 355968 size: 40907
  ret: 0         st: 0 flags:0  ts:-0.040000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 36208
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 36208
  ret: 0         st: 0 flags:1  ts: 2.840000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 804370 size: 46411
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 804366 size: 46411
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 804358 size: 46411
  ret: 0         st:-1 flags:0  ts: 1.730004
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 804370 size: 46411
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 804366 size: 46411
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 804358 size: 46411
  ret: 0         st:-1 flags:1  ts: 0.624171
- ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 171054 size: 36514
 -ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 171042 size: 36515
++ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 171042 size: 36514
  ret: 0         st: 0 flags:0  ts:-0.480000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 36208
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 36208
  ret: 0         st: 0 flags:1  ts: 2.400000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 804370 size: 46411
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 804366 size: 46411
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 804358 size: 46411
  ret: 0         st:-1 flags:0  ts: 1.306672
- ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 569930 size: 45151
 -ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 569926 size: 45151
++ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 569918 size: 45151
  ret: 0         st:-1 flags:1  ts: 0.200839
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 36208
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 36208
  ret: 0         st: 0 flags:0  ts:-0.920000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 36208
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 36208
  ret: 0         st: 0 flags:1  ts: 2.000000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 804370 size: 46411
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 804366 size: 46411
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 804358 size: 46411
  ret: 0         st:-1 flags:0  ts: 0.883340
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 355980 size: 40907
 -ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 355976 size: 40907
++ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 355968 size: 40907
  ret:-1         st:-1 flags:1  ts:-0.222493
  ret:-1         st: 0 flags:0  ts: 2.680000
  ret: 0         st: 0 flags:1  ts: 1.560000
- ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 569930 size: 45151
 -ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 569926 size: 45151
++ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 569918 size: 45151
  ret: 0         st:-1 flags:0  ts: 0.460008
- ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 171054 size: 36514
 -ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 171042 size: 36515
++ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 171042 size: 36514
  ret:-1         st:-1 flags:1  ts:-0.645825

diff --cc tests/ref/seek/mjpeg_avi
index e172b91,59db09a..c1395a9
--- 1/tests/ref/seek/mjpeg_avi
--- 2/tests/ref/seek/mjpeg_avi
+++ b/tests/ref/seek/mjpeg_avi
@@@ -1,46 -1,46 +1,46 @@@
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 12096
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 12096
  ret: 0         st:-1 flags:0  ts:-1.000000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 12096
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 12096
  ret: 0         st:-1 flags:1  ts: 1.894167
- ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos: 627826 size: 14806
 -ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos: 627854 size: 14811
++ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos: 627814 size: 14806
  ret: 0         st: 0 flags:0  ts: 0.800000
- ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos: 247510 size: 12959
 -ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos: 247488 size: 12959
++ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos: 247498 size: 12959
  ret:-1         st: 0 flags:1  ts:-0.320000
  ret:-1         st:-1 flags:0  ts: 2.576668
  ret: 0         st:-1 flags:1  ts: 1.470835
- ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos: 480748 size: 14519
 -ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos: 480758 size: 14528
++ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos: 480736 size: 14519
  ret: 0         st: 0 flags:0  ts: 0.360000
- ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: 111008 size: 11924
 -ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: 111000 size: 11927
++ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: 110996 size: 11924
  ret:-1         st: 0 flags:1  ts:-0.760000
  ret:-1         st:-1 flags:0  ts: 2.153336
  ret: 0         st:-1 flags:1  ts: 1.047503
- ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos: 326692 size: 13491
 -ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos: 326672 size: 13489
++ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos: 326680 size: 13491
  ret: 0         st: 0 flags:0  ts:-0.040000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 12096
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 12096
  ret: 0         st: 0 flags:1  ts: 2.840000
- ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 657480 size: 14897
 -ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 657522 size: 14881
++ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 657468 size: 14897
  ret: 0         st:-1 flags:0  ts: 1.730004
- ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos: 568618 size: 14751
 -ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos: 568652 size: 14746
++ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos: 568606 size: 14751
  ret: 0         st:-1 flags:1  ts: 0.624171
- ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos: 196432 size: 12720
 -ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos: 196416 size: 12719
++ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos: 196420 size: 12720
  ret: 0         st: 0 flags:0  ts:-0.480000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 12096
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 12096
  ret: 0         st: 0 flags:1  ts: 2.400000
- ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 657480 size: 14897
 -ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 657522 size: 14881
++ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 657468 size: 14897
  ret: 0         st:-1 flags:0  ts: 1.306672
- ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos: 423482 size: 14114
 -ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos: 423482 size: 14119
++ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos: 423470 size: 14114
  ret: 0         st:-1 flags:1  ts: 0.200839
- ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:  63874 size: 11715
 -ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:  63860 size: 11714
++ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:  63862 size: 11715
  ret: 0         st: 0 flags:0  ts:-0.920000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 12096
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 12096
  ret: 0         st: 0 flags:1  ts: 2.000000
- ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 657480 size: 14897
 -ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 657522 size: 14881
++ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 657468 size: 14897
  ret: 0         st:-1 flags:0  ts: 0.883340
- ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos: 273524 size: 13122
 -ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos: 273508 size: 13131
++ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos: 273512 size: 13122
  ret:-1         st:-1 flags:1  ts:-0.222493
  ret:-1         st: 0 flags:0  ts: 2.680000
  ret: 0         st: 0 flags:1  ts: 1.560000
- ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos: 509904 size: 14594
 -ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos: 509926 size: 14597
++ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos: 509892 size: 14594
  ret: 0         st:-1 flags:0  ts: 0.460008
- ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146962 size: 12173
 -ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146958 size: 12168
++ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146950 size: 12173
  ret:-1         st:-1 flags:1  ts:-0.645825

diff --cc tests/ref/seek/mpeg4_adap_avi
index c627014,87b80cc..cb6beee
--- 1/tests/ref/seek/mpeg4_adap_avi
--- 2/tests/ref/seek/mpeg4_adap_avi
+++ b/tests/ref/seek/mpeg4_adap_avi
@@@ -1,46 -1,46 +1,46 @@@
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size:  6855
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size:  6855
  ret: 0         st:-1 flags:0  ts:-1.000000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size:  6855
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size:  6855
  ret: 0         st:-1 flags:1  ts: 1.894167
- ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 174454 size: 16883
 -ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 174444 size: 16883
++ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 174442 size: 16883
  ret: 0         st: 0 flags:0  ts: 0.800000
- ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  98228 size: 17063
+ ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  98216 size: 17063
  ret:-1         st: 0 flags:1  ts:-0.320000
  ret:-1         st:-1 flags:0  ts: 2.576668
  ret: 0         st:-1 flags:1  ts: 1.470835
- ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 135590 size: 17525
 -ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 135586 size: 17525
++ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 135578 size: 17525
  ret: 0         st: 0 flags:0  ts: 0.360000
- ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  59454 size: 17261
+ ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  59442 size: 17261
  ret:-1         st: 0 flags:1  ts:-0.760000
  ret:-1         st:-1 flags:0  ts: 2.153336
  ret: 0         st:-1 flags:1  ts: 1.047503
- ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  98228 size: 17063
+ ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  98216 size: 17063
  ret: 0         st: 0 flags:0  ts:-0.040000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size:  6855
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size:  6855
  ret: 0         st: 0 flags:1  ts: 2.840000
- ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 174454 size: 16883
 -ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 174444 size: 16883
++ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 174442 size: 16883
  ret: 0         st:-1 flags:0  ts: 1.730004
- ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 174454 size: 16883
 -ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 174444 size: 16883
++ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 174442 size: 16883
  ret: 0         st:-1 flags:1  ts: 0.624171
- ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  59454 size: 17261
+ ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  59442 size: 17261
  ret: 0         st: 0 flags:0  ts:-0.480000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size:  6855
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size:  6855
  ret: 0         st: 0 flags:1  ts: 2.400000
- ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 174454 size: 16883
 -ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 174444 size: 16883
++ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 174442 size: 16883
  ret: 0         st:-1 flags:0  ts: 1.306672
- ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 135590 size: 17525
 -ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 135586 size: 17525
++ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 135578 size: 17525
  ret: 0         st:-1 flags:1  ts: 0.200839
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size:  6855
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size:  6855
  ret: 0         st: 0 flags:0  ts:-0.920000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size:  6855
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size:  6855
  ret: 0         st: 0 flags:1  ts: 2.000000
- ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 174454 size: 16883
 -ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 174444 size: 16883
++ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 174442 size: 16883
  ret: 0         st:-1 flags:0  ts: 0.883340
- ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  98228 size: 17063
+ ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  98216 size: 17063
  ret:-1         st:-1 flags:1  ts:-0.222493
  ret:-1         st: 0 flags:0  ts: 2.680000
  ret: 0         st: 0 flags:1  ts: 1.560000
- ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 135590 size: 17525
 -ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 135586 size: 17525
++ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 135578 size: 17525
  ret: 0         st:-1 flags:0  ts: 0.460008
- ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  98228 size: 17063
+ ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  98216 size: 17063
  ret:-1         st:-1 flags:1  ts:-0.645825

diff --cc tests/ref/seek/mpeg4_error_avi
index ca77060,322bcab..e31df5d
--- 1/tests/ref/seek/mpeg4_error_avi
--- 2/tests/ref/seek/mpeg4_error_avi
+++ b/tests/ref/seek/mpeg4_error_avi
@@@ -1,46 -1,46 +1,46 @@@
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size:  9729
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  9564
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  9729
  ret: 0         st:-1 flags:0  ts:-1.000000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size:  9729
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  9564
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  9729
  ret: 0         st:-1 flags:1  ts: 1.894167
- ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 113194 size: 15063
 -ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 113130 size: 12795
++ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 113182 size: 15063
  ret: 0         st: 0 flags:0  ts: 0.800000
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  73154 size: 10235
 -ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  71648 size: 11680
++ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  73142 size: 10235
  ret:-1         st: 0 flags:1  ts:-0.320000
  ret:-1         st:-1 flags:0  ts: 2.576668
  ret: 0         st:-1 flags:1  ts: 1.470835
- ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 113194 size: 15063
 -ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 113130 size: 12795
++ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 113182 size: 15063
  ret: 0         st: 0 flags:0  ts: 0.360000
- ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  38240 size: 10303
 -ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  36770 size: 10310
++ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  38228 size: 10303
  ret:-1         st: 0 flags:1  ts:-0.760000
  ret:-1         st:-1 flags:0  ts: 2.153336
  ret: 0         st:-1 flags:1  ts: 1.047503
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  73154 size: 10235
 -ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  71648 size: 11680
++ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  73142 size: 10235
  ret: 0         st: 0 flags:0  ts:-0.040000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size:  9729
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  9564
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  9729
  ret: 0         st: 0 flags:1  ts: 2.840000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 163076 size: 13980
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 159358 size: 13895
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 163064 size: 13980
  ret: 0         st:-1 flags:0  ts: 1.730004
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 163076 size: 13980
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 159358 size: 13895
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 163064 size: 13980
  ret: 0         st:-1 flags:1  ts: 0.624171
- ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  38240 size: 10303
 -ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  36770 size: 10310
++ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  38228 size: 10303
  ret: 0         st: 0 flags:0  ts:-0.480000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size:  9729
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  9564
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  9729
  ret: 0         st: 0 flags:1  ts: 2.400000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 163076 size: 13980
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 159358 size: 13895
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 163064 size: 13980
  ret: 0         st:-1 flags:0  ts: 1.306672
- ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 113194 size: 15063
 -ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 113130 size: 12795
++ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 113182 size: 15063
  ret: 0         st:-1 flags:1  ts: 0.200839
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size:  9729
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  9564
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  9729
  ret: 0         st: 0 flags:0  ts:-0.920000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size:  9729
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  9564
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  9729
  ret: 0         st: 0 flags:1  ts: 2.000000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 163076 size: 13980
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 159358 size: 13895
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 163064 size: 13980
  ret: 0         st:-1 flags:0  ts: 0.883340
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  73154 size: 10235
 -ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  71648 size: 11680
++ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  73142 size: 10235
  ret:-1         st:-1 flags:1  ts:-0.222493
  ret:-1         st: 0 flags:0  ts: 2.680000
  ret: 0         st: 0 flags:1  ts: 1.560000
- ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 113194 size: 15063
 -ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 113130 size: 12795
++ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 113182 size: 15063
  ret: 0         st:-1 flags:0  ts: 0.460008
- ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  38240 size: 10303
 -ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  36770 size: 10310
++ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  38228 size: 10303
  ret:-1         st:-1 flags:1  ts:-0.645825

diff --cc tests/ref/seek/mpeg4_nr_avi
index f31619f,5273ae1..3d6b5ce
--- 1/tests/ref/seek/mpeg4_nr_avi
--- 2/tests/ref/seek/mpeg4_nr_avi
+++ b/tests/ref/seek/mpeg4_nr_avi
@@@ -1,46 -1,46 +1,46 @@@
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 10673
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 10673
  ret: 0         st:-1 flags:0  ts:-1.000000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 10673
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 10673
  ret: 0         st:-1 flags:1  ts: 1.894167
- ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 100664 size: 12464
 -ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 100628 size: 12464
++ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 100652 size: 12464
  ret: 0         st: 0 flags:0  ts: 0.800000
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  65500 size: 11180
 -ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  65468 size: 11181
++ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  65488 size: 11180
  ret:-1         st: 0 flags:1  ts:-0.320000
  ret:-1         st:-1 flags:0  ts: 2.576668
  ret: 0         st:-1 flags:1  ts: 1.470835
- ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 100664 size: 12464
 -ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 100628 size: 12464
++ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 100652 size: 12464
  ret: 0         st: 0 flags:0  ts: 0.360000
- ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  35322 size:  9987
 -ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  35300 size:  9987
++ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  35310 size:  9987
  ret:-1         st: 0 flags:1  ts:-0.760000
  ret:-1         st:-1 flags:0  ts: 2.153336
  ret: 0         st:-1 flags:1  ts: 1.047503
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  65500 size: 11180
 -ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  65468 size: 11181
++ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  65488 size: 11180
  ret: 0         st: 0 flags:0  ts:-0.040000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 10673
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 10673
  ret: 0         st: 0 flags:1  ts: 2.840000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139384 size: 12911
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139412 size: 12911
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139372 size: 12911
  ret: 0         st:-1 flags:0  ts: 1.730004
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139384 size: 12911
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139412 size: 12911
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139372 size: 12911
  ret: 0         st:-1 flags:1  ts: 0.624171
- ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  35322 size:  9987
 -ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  35300 size:  9987
++ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  35310 size:  9987
  ret: 0         st: 0 flags:0  ts:-0.480000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 10673
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 10673
  ret: 0         st: 0 flags:1  ts: 2.400000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139384 size: 12911
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139412 size: 12911
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139372 size: 12911
  ret: 0         st:-1 flags:0  ts: 1.306672
- ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 100664 size: 12464
 -ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 100628 size: 12464
++ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 100652 size: 12464
  ret: 0         st:-1 flags:1  ts: 0.200839
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 10673
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 10673
  ret: 0         st: 0 flags:0  ts:-0.920000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 10673
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 10673
  ret: 0         st: 0 flags:1  ts: 2.000000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139384 size: 12911
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139412 size: 12911
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139372 size: 12911
  ret: 0         st:-1 flags:0  ts: 0.883340
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  65500 size: 11180
 -ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  65468 size: 11181
++ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  65488 size: 11180
  ret:-1         st:-1 flags:1  ts:-0.222493
  ret:-1         st: 0 flags:0  ts: 2.680000
  ret: 0         st: 0 flags:1  ts: 1.560000
- ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 100664 size: 12464
 -ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 100628 size: 12464
++ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 100652 size: 12464
  ret: 0         st:-1 flags:0  ts: 0.460008
- ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  35322 size:  9987
 -ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  35300 size:  9987
++ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  35310 size:  9987
  ret:-1         st:-1 flags:1  ts:-0.645825

diff --cc tests/ref/seek/mpeg4_qpel_avi
index 63b474c,195fb30..cd6eaf0
--- 1/tests/ref/seek/mpeg4_qpel_avi
--- 2/tests/ref/seek/mpeg4_qpel_avi
+++ b/tests/ref/seek/mpeg4_qpel_avi
@@@ -1,46 -1,46 +1,46 @@@
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size: 11938
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 11942
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 11938
  ret: 0         st:-1 flags:0  ts:-1.000000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size: 11938
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 11942
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 11938
  ret: 0         st:-1 flags:1  ts: 1.894167
- ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 141538 size: 15554
 -ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 141518 size: 15562
++ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 141526 size: 15554
  ret: 0         st: 0 flags:0  ts: 0.800000
- ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  64122 size: 13377
 -ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  64104 size: 13382
++ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  64110 size: 13377
  ret:-1         st: 0 flags:1  ts:-0.320000
  ret:-1         st:-1 flags:0  ts: 2.576668
  ret: 0         st:-1 flags:1  ts: 1.470835
- ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 100348 size: 15055
 -ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 100356 size: 15057
++ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 100336 size: 15055
  ret: 0         st: 0 flags:0  ts: 0.360000
- ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  32848 size: 11806
 -ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  32806 size: 11813
++ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  32836 size: 11806
  ret:-1         st: 0 flags:1  ts:-0.760000
  ret:-1         st:-1 flags:0  ts: 2.153336
  ret: 0         st:-1 flags:1  ts: 1.047503
- ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  64122 size: 13377
 -ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  64104 size: 13382
++ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  64110 size: 13377
  ret: 0         st: 0 flags:0  ts:-0.040000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size: 11938
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 11942
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 11938
  ret: 0         st: 0 flags:1  ts: 2.840000
- ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 141538 size: 15554
 -ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 141518 size: 15562
++ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 141526 size: 15554
  ret: 0         st:-1 flags:0  ts: 1.730004
- ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 141538 size: 15554
 -ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 141518 size: 15562
++ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 141526 size: 15554
  ret: 0         st:-1 flags:1  ts: 0.624171
- ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  32848 size: 11806
 -ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  32806 size: 11813
++ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  32836 size: 11806
  ret: 0         st: 0 flags:0  ts:-0.480000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size: 11938
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 11942
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 11938
  ret: 0         st: 0 flags:1  ts: 2.400000
- ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 141538 size: 15554
 -ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 141518 size: 15562
++ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 141526 size: 15554
  ret: 0         st:-1 flags:0  ts: 1.306672
- ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 100348 size: 15055
 -ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 100356 size: 15057
++ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 100336 size: 15055
  ret: 0         st:-1 flags:1  ts: 0.200839
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size: 11938
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 11942
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 11938
  ret: 0         st: 0 flags:0  ts:-0.920000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size: 11938
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 11942
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 11938
  ret: 0         st: 0 flags:1  ts: 2.000000
- ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 141538 size: 15554
 -ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 141518 size: 15562
++ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 141526 size: 15554
  ret: 0         st:-1 flags:0  ts: 0.883340
- ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  64122 size: 13377
 -ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  64104 size: 13382
++ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  64110 size: 13377
  ret:-1         st:-1 flags:1  ts:-0.222493
  ret:-1         st: 0 flags:0  ts: 2.680000
  ret: 0         st: 0 flags:1  ts: 1.560000
- ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 100348 size: 15055
 -ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 100356 size: 15057
++ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 100336 size: 15055
  ret: 0         st:-1 flags:0  ts: 0.460008
- ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  64122 size: 13377
 -ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  64104 size: 13382
++ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  64110 size: 13377
  ret:-1         st:-1 flags:1  ts:-0.645825

diff --cc tests/ref/seek/mpeg4_qprd_avi
index 61605de,4c3c7f5..74aee79
--- 1/tests/ref/seek/mpeg4_qprd_avi
--- 2/tests/ref/seek/mpeg4_qprd_avi
+++ b/tests/ref/seek/mpeg4_qprd_avi
@@@ -1,46 -1,46 +1,46 @@@
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size: 14873
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 14873
  ret: 0         st:-1 flags:0  ts:-1.000000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size: 14873
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 14873
  ret: 0         st:-1 flags:1  ts: 1.894167
- ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 211042 size: 14638
 -ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 211020 size: 14638
++ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 211030 size: 14638
  ret: 0         st: 0 flags:0  ts: 0.800000
- ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 150666 size: 14502
+ ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 150654 size: 14502
  ret:-1         st: 0 flags:1  ts:-0.320000
  ret:-1         st:-1 flags:0  ts: 2.576668
  ret: 0         st:-1 flags:1  ts: 1.470835
- ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 180790 size: 14371
 -ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 180770 size: 14371
++ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 180778 size: 14371
  ret: 0         st: 0 flags:0  ts: 0.360000
- ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  93036 size: 29366
+ ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  93024 size: 29366
  ret:-1         st: 0 flags:1  ts:-0.760000
  ret:-1         st:-1 flags:0  ts: 2.153336
  ret: 0         st:-1 flags:1  ts: 1.047503
- ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 150666 size: 14502
+ ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 150654 size: 14502
  ret: 0         st: 0 flags:0  ts:-0.040000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size: 14873
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 14873
  ret: 0         st: 0 flags:1  ts: 2.840000
- ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 211042 size: 14638
 -ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 211020 size: 14638
++ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 211030 size: 14638
  ret: 0         st:-1 flags:0  ts: 1.730004
- ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 211042 size: 14638
 -ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 211020 size: 14638
++ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 211030 size: 14638
  ret: 0         st:-1 flags:1  ts: 0.624171
- ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  93036 size: 29366
+ ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  93024 size: 29366
  ret: 0         st: 0 flags:0  ts:-0.480000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size: 14873
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 14873
  ret: 0         st: 0 flags:1  ts: 2.400000
- ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 211042 size: 14638
 -ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 211020 size: 14638
++ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 211030 size: 14638
  ret: 0         st:-1 flags:0  ts: 1.306672
- ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 180790 size: 14371
 -ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 180770 size: 14371
++ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 180778 size: 14371
  ret: 0         st:-1 flags:1  ts: 0.200839
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size: 14873
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 14873
  ret: 0         st: 0 flags:0  ts:-0.920000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size: 14873
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 14873
  ret: 0         st: 0 flags:1  ts: 2.000000
- ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 211042 size: 14638
 -ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 211020 size: 14638
++ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 211030 size: 14638
  ret: 0         st:-1 flags:0  ts: 0.883340
- ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 150666 size: 14502
+ ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 150654 size: 14502
  ret:-1         st:-1 flags:1  ts:-0.222493
  ret:-1         st: 0 flags:0  ts: 2.680000
  ret: 0         st: 0 flags:1  ts: 1.560000
- ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 180790 size: 14371
 -ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 180770 size: 14371
++ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 180778 size: 14371
  ret: 0         st:-1 flags:0  ts: 0.460008
- ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 150666 size: 14502
+ ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 150654 size: 14502
  ret:-1         st:-1 flags:1  ts:-0.645825

diff --cc tests/ref/seek/mpeg4_rc_avi
index fbefdc0,5c96c78..6bcfd48
--- 1/tests/ref/seek/mpeg4_rc_avi
--- 2/tests/ref/seek/mpeg4_rc_avi
+++ b/tests/ref/seek/mpeg4_rc_avi
@@@ -1,46 -1,46 +1,46 @@@
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size: 15766
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 15766
  ret: 0         st:-1 flags:0  ts:-1.000000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size: 15766
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 15766
  ret: 0         st:-1 flags:1  ts: 1.894167
- ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 207962 size: 13826
 -ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 207956 size: 13826
++ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 207950 size: 13826
  ret: 0         st: 0 flags:0  ts: 0.800000
- ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 153796 size: 13377
 -ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 153800 size: 13382
++ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 153784 size: 13377
  ret:-1         st: 0 flags:1  ts:-0.320000
  ret:-1         st:-1 flags:0  ts: 2.576668
  ret: 0         st:-1 flags:1  ts: 1.470835
- ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 180958 size: 13326
 -ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 180948 size: 13326
++ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 180946 size: 13326
  ret: 0         st: 0 flags:0  ts: 0.360000
- ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  94586 size: 32807
 -ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  94582 size: 32807
++ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  94574 size: 32807
  ret:-1         st: 0 flags:1  ts:-0.760000
  ret:-1         st:-1 flags:0  ts: 2.153336
  ret: 0         st:-1 flags:1  ts: 1.047503
- ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 153796 size: 13377
 -ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 153800 size: 13382
++ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 153784 size: 13377
  ret: 0         st: 0 flags:0  ts:-0.040000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size: 15766
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 15766
  ret: 0         st: 0 flags:1  ts: 2.840000
- ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 207962 size: 13826
 -ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 207956 size: 13826
++ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 207950 size: 13826
  ret: 0         st:-1 flags:0  ts: 1.730004
- ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 207962 size: 13826
 -ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 207956 size: 13826
++ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 207950 size: 13826
  ret: 0         st:-1 flags:1  ts: 0.624171
- ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  94586 size: 32807
 -ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  94582 size: 32807
++ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  94574 size: 32807
  ret: 0         st: 0 flags:0  ts:-0.480000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size: 15766
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 15766
  ret: 0         st: 0 flags:1  ts: 2.400000
- ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 207962 size: 13826
 -ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 207956 size: 13826
++ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 207950 size: 13826
  ret: 0         st:-1 flags:0  ts: 1.306672
- ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 180958 size: 13326
 -ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 180948 size: 13326
++ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 180946 size: 13326
  ret: 0         st:-1 flags:1  ts: 0.200839
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size: 15766
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 15766
  ret: 0         st: 0 flags:0  ts:-0.920000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size: 15766
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 15766
  ret: 0         st: 0 flags:1  ts: 2.000000
- ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 207962 size: 13826
 -ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 207956 size: 13826
++ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 207950 size: 13826
  ret: 0         st:-1 flags:0  ts: 0.883340
- ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 153796 size: 13377
 -ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 153800 size: 13382
++ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 153784 size: 13377
  ret:-1         st:-1 flags:1  ts:-0.222493
  ret:-1         st: 0 flags:0  ts: 2.680000
  ret: 0         st: 0 flags:1  ts: 1.560000
- ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 180958 size: 13326
 -ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 180948 size: 13326
++ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 180946 size: 13326
  ret: 0         st:-1 flags:0  ts: 0.460008
- ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 153796 size: 13377
 -ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 153800 size: 13382
++ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 153784 size: 13377
  ret:-1         st:-1 flags:1  ts:-0.645825

diff --cc tests/ref/seek/mpeg4_thread_avi
index 6ddeeb2,8c4f663..ca849f3
--- 1/tests/ref/seek/mpeg4_thread_avi
--- 2/tests/ref/seek/mpeg4_thread_avi
+++ b/tests/ref/seek/mpeg4_thread_avi
@@@ -1,46 -1,46 +1,46 @@@
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size: 14874
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 14874
  ret: 0         st:-1 flags:0  ts:-1.000000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size: 14874
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 14874
  ret: 0         st:-1 flags:1  ts: 1.894167
- ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 228198 size: 16323
 -ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 228210 size: 16324
++ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 228186 size: 16323
  ret: 0         st: 0 flags:0  ts: 0.800000
- ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 162168 size: 16462
 -ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 162150 size: 16475
++ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 162156 size: 16462
  ret:-1         st: 0 flags:1  ts:-0.320000
  ret:-1         st:-1 flags:0  ts: 2.576668
  ret: 0         st:-1 flags:1  ts: 1.470835
- ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 195342 size: 16153
 -ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 195320 size: 16136
++ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 195330 size: 16153
  ret: 0         st: 0 flags:0  ts: 0.360000
- ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  97844 size: 33332
+ ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  97832 size: 33332
  ret:-1         st: 0 flags:1  ts:-0.760000
  ret:-1         st:-1 flags:0  ts: 2.153336
  ret: 0         st:-1 flags:1  ts: 1.047503
- ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 162168 size: 16462
 -ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 162150 size: 16475
++ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 162156 size: 16462
  ret: 0         st: 0 flags:0  ts:-0.040000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size: 14874
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 14874
  ret: 0         st: 0 flags:1  ts: 2.840000
- ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 228198 size: 16323
 -ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 228210 size: 16324
++ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 228186 size: 16323
  ret: 0         st:-1 flags:0  ts: 1.730004
- ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 228198 size: 16323
 -ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 228210 size: 16324
++ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 228186 size: 16323
  ret: 0         st:-1 flags:1  ts: 0.624171
- ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  97844 size: 33332
+ ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  97832 size: 33332
  ret: 0         st: 0 flags:0  ts:-0.480000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size: 14874
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 14874
  ret: 0         st: 0 flags:1  ts: 2.400000
- ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 228198 size: 16323
 -ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 228210 size: 16324
++ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 228186 size: 16323
  ret: 0         st:-1 flags:0  ts: 1.306672
- ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 195342 size: 16153
 -ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 195320 size: 16136
++ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 195330 size: 16153
  ret: 0         st:-1 flags:1  ts: 0.200839
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size: 14874
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 14874
  ret: 0         st: 0 flags:0  ts:-0.920000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5660 size: 14874
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 14874
  ret: 0         st: 0 flags:1  ts: 2.000000
- ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 228198 size: 16323
 -ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 228210 size: 16324
++ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 228186 size: 16323
  ret: 0         st:-1 flags:0  ts: 0.883340
- ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 162168 size: 16462
 -ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 162150 size: 16475
++ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 162156 size: 16462
  ret:-1         st:-1 flags:1  ts:-0.222493
  ret:-1         st: 0 flags:0  ts: 2.680000
  ret: 0         st: 0 flags:1  ts: 1.560000
- ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 195342 size: 16153
 -ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 195320 size: 16136
++ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 195330 size: 16153
  ret: 0         st:-1 flags:0  ts: 0.460008
- ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 162168 size: 16462
 -ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 162150 size: 16475
++ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 162156 size: 16462
  ret:-1         st:-1 flags:1  ts:-0.645825

diff --cc tests/ref/seek/msmpeg4_avi
index f95d615,323f96a..e096f76
--- 1/tests/ref/seek/msmpeg4_avi
--- 2/tests/ref/seek/msmpeg4_avi
+++ b/tests/ref/seek/msmpeg4_avi
@@@ -14,29 -14,29 +14,29 @@@ ret: 0         st: 0 flags:1 dts: 0.480
  ret:-1         st: 0 flags:1  ts:-0.760000
  ret:-1         st:-1 flags:0  ts: 2.153336
  ret: 0         st:-1 flags:1  ts: 1.047503
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  53858 size:  9624
+ ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  53846 size:  9624
  ret: 0         st: 0 flags:0  ts:-0.040000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size:  8637
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  8637
  ret: 0         st: 0 flags:1  ts: 2.840000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 114268 size: 11180
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 114264 size: 11180
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 114256 size: 11180
  ret: 0         st:-1 flags:0  ts: 1.730004
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 114268 size: 11180
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 114264 size: 11180
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 114256 size: 11180
  ret: 0         st:-1 flags:1  ts: 0.624171
- ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29400 size:  8502
+ ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29388 size:  8502
  ret: 0         st: 0 flags:0  ts:-0.480000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size:  8637
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  8637
  ret: 0         st: 0 flags:1  ts: 2.400000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 114268 size: 11180
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 114264 size: 11180
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 114256 size: 11180
  ret: 0         st:-1 flags:0  ts: 1.306672
- ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  82520 size: 10783
+ ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  82508 size: 10783
  ret: 0         st:-1 flags:1  ts: 0.200839
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size:  8637
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  8637
  ret: 0         st: 0 flags:0  ts:-0.920000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size:  8637
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  8637
  ret: 0         st: 0 flags:1  ts: 2.000000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 114268 size: 11180
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 114264 size: 11180
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 114256 size: 11180
  ret: 0         st:-1 flags:0  ts: 0.883340
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  53858 size:  9624
+ ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  53846 size:  9624
  ret:-1         st:-1 flags:1  ts:-0.222493
  ret:-1         st: 0 flags:0  ts: 2.680000
  ret: 0         st: 0 flags:1  ts: 1.560000

diff --cc tests/ref/seek/msmpeg4v2_avi
index 21804fe,177898e..00a175d
--- 1/tests/ref/seek/msmpeg4v2_avi
--- 2/tests/ref/seek/msmpeg4v2_avi
+++ b/tests/ref/seek/msmpeg4v2_avi
@@@ -14,29 -14,29 +14,29 @@@ ret: 0         st: 0 flags:1 dts: 0.480
  ret:-1         st: 0 flags:1  ts:-0.760000
  ret:-1         st:-1 flags:0  ts: 2.153336
  ret: 0         st:-1 flags:1  ts: 1.047503
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54790 size: 10010
+ ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54778 size: 10010
  ret: 0         st: 0 flags:0  ts:-0.040000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size:  9003
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  9003
  ret: 0         st: 0 flags:1  ts: 2.840000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116124 size: 11578
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116100 size: 11578
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116112 size: 11578
  ret: 0         st:-1 flags:0  ts: 1.730004
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116124 size: 11578
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116100 size: 11578
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116112 size: 11578
  ret: 0         st:-1 flags:1  ts: 0.624171
- ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29782 size:  8869
+ ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29770 size:  8869
  ret: 0         st: 0 flags:0  ts:-0.480000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size:  9003
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  9003
  ret: 0         st: 0 flags:1  ts: 2.400000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116124 size: 11578
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116100 size: 11578
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116112 size: 11578
  ret: 0         st:-1 flags:0  ts: 1.306672
- ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83882 size: 11165
+ ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83870 size: 11165
  ret: 0         st:-1 flags:1  ts: 0.200839
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size:  9003
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  9003
  ret: 0         st: 0 flags:0  ts:-0.920000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size:  9003
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  9003
  ret: 0         st: 0 flags:1  ts: 2.000000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116124 size: 11578
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116100 size: 11578
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116112 size: 11578
  ret: 0         st:-1 flags:0  ts: 0.883340
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54790 size: 10010
+ ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54778 size: 10010
  ret:-1         st:-1 flags:1  ts:-0.222493
  ret:-1         st: 0 flags:0  ts: 2.680000
  ret: 0         st: 0 flags:1  ts: 1.560000

diff --cc tests/ref/seek/wmv1_avi
index 836f7b6,85465b3..0f073b2
--- 1/tests/ref/seek/wmv1_avi
--- 2/tests/ref/seek/wmv1_avi
+++ b/tests/ref/seek/wmv1_avi
@@@ -14,29 -14,29 +14,29 @@@ ret: 0         st: 0 flags:1 dts: 0.480
  ret:-1         st: 0 flags:1  ts:-0.760000
  ret:-1         st:-1 flags:0  ts: 2.153336
  ret: 0         st:-1 flags:1  ts: 1.047503
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54770 size:  9931
+ ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54758 size:  9931
  ret: 0         st: 0 flags:0  ts:-0.040000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size:  8990
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  8990
  ret: 0         st: 0 flags:1  ts: 2.840000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 115818 size: 11486
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 115812 size: 11487
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 115806 size: 11486
  ret: 0         st:-1 flags:0  ts: 1.730004
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 115818 size: 11486
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 115812 size: 11487
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 115806 size: 11486
  ret: 0         st:-1 flags:1  ts: 0.624171
- ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29806 size:  8796
+ ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29794 size:  8796
  ret: 0         st: 0 flags:0  ts:-0.480000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size:  8990
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  8990
  ret: 0         st: 0 flags:1  ts: 2.400000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 115818 size: 11486
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 115812 size: 11487
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 115806 size: 11486
  ret: 0         st:-1 flags:0  ts: 1.306672
- ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83754 size: 11099
+ ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83742 size: 11099
  ret: 0         st:-1 flags:1  ts: 0.200839
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size:  8990
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  8990
  ret: 0         st: 0 flags:0  ts:-0.920000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size:  8990
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  8990
  ret: 0         st: 0 flags:1  ts: 2.000000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 115818 size: 11486
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 115812 size: 11487
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 115806 size: 11486
  ret: 0         st:-1 flags:0  ts: 0.883340
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54770 size:  9931
+ ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54758 size:  9931
  ret:-1         st:-1 flags:1  ts:-0.222493
  ret:-1         st: 0 flags:0  ts: 2.680000
  ret: 0         st: 0 flags:1  ts: 1.560000

diff --cc tests/ref/seek/wmv2_avi
index af03bea,8ed257e..8b9d3f3
--- 1/tests/ref/seek/wmv2_avi
--- 2/tests/ref/seek/wmv2_avi
+++ b/tests/ref/seek/wmv2_avi
@@@ -1,46 -1,46 +1,46 @@@
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5664 size:  8917
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8917
  ret: 0         st:-1 flags:0  ts:-1.000000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5664 size:  8917
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8917
  ret: 0         st:-1 flags:1  ts: 1.894167
- ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83802 size: 11169
 -ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83790 size: 11170
++ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83790 size: 11169
  ret: 0         st: 0 flags:0  ts: 0.800000
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54584 size:  9989
+ ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54572 size:  9989
  ret:-1         st: 0 flags:1  ts:-0.320000
  ret:-1         st:-1 flags:0  ts: 2.576668
  ret: 0         st:-1 flags:1  ts: 1.470835
- ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83802 size: 11169
 -ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83790 size: 11170
++ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83790 size: 11169
  ret: 0         st: 0 flags:0  ts: 0.360000
- ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29644 size:  8839
+ ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29632 size:  8839
  ret:-1         st: 0 flags:1  ts:-0.760000
  ret:-1         st:-1 flags:0  ts: 2.153336
  ret: 0         st:-1 flags:1  ts: 1.047503
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54584 size:  9989
+ ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54572 size:  9989
  ret: 0         st: 0 flags:0  ts:-0.040000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5664 size:  8917
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8917
  ret: 0         st: 0 flags:1  ts: 2.840000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116056 size: 11554
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116058 size: 11554
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116044 size: 11554
  ret: 0         st:-1 flags:0  ts: 1.730004
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116056 size: 11554
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116058 size: 11554
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116044 size: 11554
  ret: 0         st:-1 flags:1  ts: 0.624171
- ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29644 size:  8839
+ ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29632 size:  8839
  ret: 0         st: 0 flags:0  ts:-0.480000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5664 size:  8917
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8917
  ret: 0         st: 0 flags:1  ts: 2.400000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116056 size: 11554
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116058 size: 11554
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116044 size: 11554
  ret: 0         st:-1 flags:0  ts: 1.306672
- ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83802 size: 11169
 -ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83790 size: 11170
++ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83790 size: 11169
  ret: 0         st:-1 flags:1  ts: 0.200839
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5664 size:  8917
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8917
  ret: 0         st: 0 flags:0  ts:-0.920000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5664 size:  8917
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8917
  ret: 0         st: 0 flags:1  ts: 2.000000
- ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116056 size: 11554
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116058 size: 11554
++ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116044 size: 11554
  ret: 0         st:-1 flags:0  ts: 0.883340
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54584 size:  9989
+ ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54572 size:  9989
  ret:-1         st:-1 flags:1  ts:-0.222493
  ret:-1         st: 0 flags:0  ts: 2.680000
  ret: 0         st: 0 flags:1  ts: 1.560000
- ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83802 size: 11169
 -ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83790 size: 11170
++ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83790 size: 11169
  ret: 0         st:-1 flags:0  ts: 0.460008
- ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29644 size:  8839
+ ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29632 size:  8839
  ret:-1         st:-1 flags:1  ts:-0.645825