Merge remote-tracking branch 'newdev/master'

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

3 files changed, 81 insertions, 87 deletions

diff --git a/tests/ref/seek/lavf_asf b/tests/ref/seek/lavf_asf
index afaed99e77..757fd0e0bb 100644
--- a/tests/ref/seek/lavf_asf
+++ b/tests/ref/seek/lavf_asf
@@ -1,53 +1,47 @@
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    575 size: 28487
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    575 size: 28487
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 1 flags:1 dts: 3.544000 pts: 3.544000 pos: 147775 size:   209
+ret: 0         st: 1 flags:1 dts: 0.444000 pts: 0.444000 pos: 147775 size:   209
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    575 size: 28487
+ret: 0         st: 1 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:   209
 ret: 0         st: 0 flags:0  ts: 0.788000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    575 size: 28487
+ret: 0         st: 1 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:   209
 ret: 0         st: 0 flags:1  ts:-0.317000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    575 size: 28487
-ret: 0         st: 1 flags:0  ts: 2.577000
-ret: 0         st: 1 flags:1 dts: 3.100000 pts: 3.100000 pos:  29375 size:   208
-ret: 0         st: 1 flags:1  ts: 1.471000
-ret: 0         st: 1 flags:1 dts: 3.100000 pts: 3.100000 pos:  29375 size:   208
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    575 size: 28487
+ret:-1         st: 1 flags:0  ts: 2.577000
+ret:-1         st: 1 flags:1  ts: 1.471000
 ret: 0         st:-1 flags:0  ts: 0.365002
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    575 size: 28487
+ret: 0         st: 1 flags:1 dts: 0.444000 pts: 0.444000 pos: 147775 size:   209
 ret: 0         st:-1 flags:1  ts:-0.740831
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    575 size: 28487
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    575 size: 28487
 ret: 0         st: 0 flags:0  ts: 2.153000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    575 size: 28487
+ret: 0         st: 1 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:   209
 ret: 0         st: 0 flags:1  ts: 1.048000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    575 size: 28487
+ret: 0         st: 1 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:   209
 ret: 0         st: 1 flags:0  ts:-0.058000
-ret: 0         st: 1 flags:1 dts: 3.100000 pts: 3.100000 pos:  29375 size:   208
-ret: 0         st: 1 flags:1  ts: 2.836000
-ret: 0         st: 1 flags:1 dts: 3.100000 pts: 3.100000 pos:  29375 size:   208
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:  29375 size:   208
+ret:-1         st: 1 flags:1  ts: 2.836000
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    575 size: 28487
+ret: 0         st: 1 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:   209
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    575 size: 28487
+ret: 0         st: 1 flags:1 dts: 0.444000 pts: 0.444000 pos: 147775 size:   209
 ret: 0         st: 0 flags:0  ts:-0.482000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    575 size: 28487
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    575 size: 28487
 ret: 0         st: 0 flags:1  ts: 2.413000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    575 size: 28487
-ret: 0         st: 1 flags:0  ts: 1.307000
-ret: 0         st: 1 flags:1 dts: 3.100000 pts: 3.100000 pos:  29375 size:   208
+ret: 0         st: 1 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:   209
+ret:-1         st: 1 flags:0  ts: 1.307000
 ret: 0         st: 1 flags:1  ts: 0.201000
-ret: 0         st: 1 flags:1 dts: 3.100000 pts: 3.100000 pos:  29375 size:   208
+ret: 0         st: 1 flags:1 dts: 0.183000 pts: 0.183000 pos:  70975 size:   209
 ret: 0         st:-1 flags:0  ts:-0.904994
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    575 size: 28487
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    575 size: 28487
 ret: 0         st:-1 flags:1  ts: 1.989173
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    575 size: 28487
+ret: 0         st: 1 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:   209
 ret: 0         st: 0 flags:0  ts: 0.883000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    575 size: 28487
+ret: 0         st: 1 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:   209
 ret: 0         st: 0 flags:1  ts:-0.222000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    575 size: 28487
-ret: 0         st: 1 flags:0  ts: 2.672000
-ret: 0         st: 1 flags:1 dts: 3.100000 pts: 3.100000 pos:  29375 size:   208
-ret: 0         st: 1 flags:1  ts: 1.566000
-ret: 0         st: 1 flags:1 dts: 3.100000 pts: 3.100000 pos:  29375 size:   208
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    575 size: 28487
+ret:-1         st: 1 flags:0  ts: 2.672000
+ret:-1         st: 1 flags:1  ts: 1.566000
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    575 size: 28487
+ret: 0         st: 1 flags:1 dts: 0.444000 pts: 0.444000 pos: 147775 size:   209
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    575 size: 28487
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    575 size: 28487
diff --git a/tests/ref/seek/wmav1_asf b/tests/ref/seek/wmav1_asf
index a2892b6344..47c5b46621 100644
--- a/tests/ref/seek/wmav1_asf
+++ b/tests/ref/seek/wmav1_asf
@@ -1,53 +1,53 @@
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    404 size:   743
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    404 size:   743
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 3.286000 pts: 3.286000 pos:   3604 size:   743
+ret: 0         st: 0 flags:1 dts: 0.186000 pts: 0.186000 pos:   3604 size:   743
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    404 size:   743
+ret: 0         st: 0 flags:1 dts: 1.858000 pts: 1.858000 pos:  32404 size:   743
 ret: 0         st: 0 flags:0  ts: 0.788000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    404 size:   743
+ret: 0         st: 0 flags:1 dts: 0.929000 pts: 0.929000 pos:  16404 size:   743
 ret: 0         st: 0 flags:1  ts:-0.317000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    404 size:   743
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    404 size:   743
 ret: 0         st:-1 flags:0  ts: 2.576668
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    404 size:   743
+ret: 0         st: 0 flags:1 dts: 2.601000 pts: 2.601000 pos:  45204 size:   743
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    404 size:   743
+ret: 0         st: 0 flags:1 dts: 1.300000 pts: 1.300000 pos:  22804 size:   743
 ret: 0         st: 0 flags:0  ts: 0.365000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    404 size:   743
+ret: 0         st: 0 flags:1 dts: 0.372000 pts: 0.372000 pos:   6804 size:   743
 ret: 0         st: 0 flags:1  ts:-0.741000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    404 size:   743
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    404 size:   743
 ret: 0         st:-1 flags:0  ts: 2.153336
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    404 size:   743
+ret: 0         st: 0 flags:1 dts: 2.229000 pts: 2.229000 pos:  38804 size:   743
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    404 size:   743
+ret: 0         st: 0 flags:1 dts: 0.929000 pts: 0.929000 pos:  16404 size:   743
 ret: 0         st: 0 flags:0  ts:-0.058000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    404 size:   743
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    404 size:   743
 ret: 0         st: 0 flags:1  ts: 2.836000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    404 size:   743
+ret: 0         st: 0 flags:1 dts: 2.786000 pts: 2.786000 pos:  48404 size:   743
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    404 size:   743
+ret: 0         st: 0 flags:1 dts: 1.858000 pts: 1.858000 pos:  32404 size:   743
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    404 size:   743
+ret: 0         st: 0 flags:1 dts: 0.557000 pts: 0.557000 pos:  10004 size:   743
 ret: 0         st: 0 flags:0  ts:-0.482000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    404 size:   743
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    404 size:   743
 ret: 0         st: 0 flags:1  ts: 2.413000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    404 size:   743
+ret: 0         st: 0 flags:1 dts: 2.229000 pts: 2.229000 pos:  38804 size:   743
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    404 size:   743
+ret: 0         st: 0 flags:1 dts: 1.486000 pts: 1.486000 pos:  26004 size:   743
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    404 size:   743
+ret: 0         st: 0 flags:1 dts: 0.186000 pts: 0.186000 pos:   3604 size:   743
 ret: 0         st: 0 flags:0  ts:-0.905000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    404 size:   743
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    404 size:   743
 ret: 0         st: 0 flags:1  ts: 1.989000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    404 size:   743
+ret: 0         st: 0 flags:1 dts: 1.858000 pts: 1.858000 pos:  32404 size:   743
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    404 size:   743
+ret: 0         st: 0 flags:1 dts: 0.929000 pts: 0.929000 pos:  16404 size:   743
 ret: 0         st:-1 flags:1  ts:-0.222493
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    404 size:   743
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    404 size:   743
 ret: 0         st: 0 flags:0  ts: 2.672000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    404 size:   743
+ret: 0         st: 0 flags:1 dts: 2.786000 pts: 2.786000 pos:  48404 size:   743
 ret: 0         st: 0 flags:1  ts: 1.566000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    404 size:   743
+ret: 0         st: 0 flags:1 dts: 1.486000 pts: 1.486000 pos:  26004 size:   743
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    404 size:   743
+ret: 0         st: 0 flags:1 dts: 0.557000 pts: 0.557000 pos:  10004 size:   743
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    404 size:   743
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    404 size:   743
diff --git a/tests/ref/seek/wmav2_asf b/tests/ref/seek/wmav2_asf
index bd1b79e48b..7c58da2320 100644
--- a/tests/ref/seek/wmav2_asf
+++ b/tests/ref/seek/wmav2_asf
@@ -1,53 +1,53 @@
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    444 size:   743
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    444 size:   743
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 3.286000 pts: 3.286000 pos:   3644 size:   743
+ret: 0         st: 0 flags:1 dts: 0.186000 pts: 0.186000 pos:   3644 size:   743
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    444 size:   743
+ret: 0         st: 0 flags:1 dts: 1.858000 pts: 1.858000 pos:  32444 size:   743
 ret: 0         st: 0 flags:0  ts: 0.788000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    444 size:   743
+ret: 0         st: 0 flags:1 dts: 0.929000 pts: 0.929000 pos:  16444 size:   743
 ret: 0         st: 0 flags:1  ts:-0.317000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    444 size:   743
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    444 size:   743
 ret: 0         st:-1 flags:0  ts: 2.576668
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    444 size:   743
+ret: 0         st: 0 flags:1 dts: 2.601000 pts: 2.601000 pos:  45244 size:   743
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    444 size:   743
+ret: 0         st: 0 flags:1 dts: 1.300000 pts: 1.300000 pos:  22844 size:   743
 ret: 0         st: 0 flags:0  ts: 0.365000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    444 size:   743
+ret: 0         st: 0 flags:1 dts: 0.372000 pts: 0.372000 pos:   6844 size:   743
 ret: 0         st: 0 flags:1  ts:-0.741000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    444 size:   743
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    444 size:   743
 ret: 0         st:-1 flags:0  ts: 2.153336
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    444 size:   743
+ret: 0         st: 0 flags:1 dts: 2.229000 pts: 2.229000 pos:  38844 size:   743
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    444 size:   743
+ret: 0         st: 0 flags:1 dts: 0.929000 pts: 0.929000 pos:  16444 size:   743
 ret: 0         st: 0 flags:0  ts:-0.058000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    444 size:   743
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    444 size:   743
 ret: 0         st: 0 flags:1  ts: 2.836000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    444 size:   743
+ret: 0         st: 0 flags:1 dts: 2.786000 pts: 2.786000 pos:  48444 size:   743
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    444 size:   743
+ret: 0         st: 0 flags:1 dts: 1.858000 pts: 1.858000 pos:  32444 size:   743
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    444 size:   743
+ret: 0         st: 0 flags:1 dts: 0.557000 pts: 0.557000 pos:  10044 size:   743
 ret: 0         st: 0 flags:0  ts:-0.482000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    444 size:   743
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    444 size:   743
 ret: 0         st: 0 flags:1  ts: 2.413000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    444 size:   743
+ret: 0         st: 0 flags:1 dts: 2.229000 pts: 2.229000 pos:  38844 size:   743
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    444 size:   743
+ret: 0         st: 0 flags:1 dts: 1.486000 pts: 1.486000 pos:  26044 size:   743
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    444 size:   743
+ret: 0         st: 0 flags:1 dts: 0.186000 pts: 0.186000 pos:   3644 size:   743
 ret: 0         st: 0 flags:0  ts:-0.905000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    444 size:   743
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    444 size:   743
 ret: 0         st: 0 flags:1  ts: 1.989000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    444 size:   743
+ret: 0         st: 0 flags:1 dts: 1.858000 pts: 1.858000 pos:  32444 size:   743
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    444 size:   743
+ret: 0         st: 0 flags:1 dts: 0.929000 pts: 0.929000 pos:  16444 size:   743
 ret: 0         st:-1 flags:1  ts:-0.222493
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    444 size:   743
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    444 size:   743
 ret: 0         st: 0 flags:0  ts: 2.672000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    444 size:   743
+ret: 0         st: 0 flags:1 dts: 2.786000 pts: 2.786000 pos:  48444 size:   743
 ret: 0         st: 0 flags:1  ts: 1.566000
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    444 size:   743
+ret: 0         st: 0 flags:1 dts: 1.486000 pts: 1.486000 pos:  26044 size:   743
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    444 size:   743
+ret: 0         st: 0 flags:1 dts: 0.557000 pts: 0.557000 pos:  10044 size:   743
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 3.100000 pts: 3.100000 pos:    444 size:   743
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    444 size:   743