Insert null packets to keep pcr values correct, patch by Mike Scheutzow,

scheutzow at alcatel-lucent dot com and Niobos, niobos at dest-unreach dot be.

Originally committed as revision 21199 to svn://svn.ffmpeg.org/ffmpeg/trunk

2 files changed, 28 insertions, 28 deletions

diff --git a/tests/lavf.regression.ref b/tests/lavf.regression.ref
index 0ce3ca3eb7..83be8dbedf 100644
--- a/tests/lavf.regression.ref
+++ b/tests/lavf.regression.ref
@@ -15,8 +15,8 @@ e36a005ecca9add8bda6e0655d03716f *./tests/data/b-lavf.mpg
 b3174e2db508564c1cce0b5e3c1bc1bd *./tests/data/b-lavf.mxf_d10
 5330989 ./tests/data/b-lavf.mxf_d10
 ./tests/data/b-lavf.mxf_d10 CRC=0xc3f4f92e
-5db794c5f69f934bbcdbe32de1df9f3a *./tests/data/b-lavf.ts
-436160 ./tests/data/b-lavf.ts
+da0d4fea54e7473e3cddb1607294c9e2 *./tests/data/b-lavf.ts
+430144 ./tests/data/b-lavf.ts
 ./tests/data/b-lavf.ts CRC=0x133216c1
 62c5aeb636fc82cf6ba6277d36e42cb5 *./tests/data/b-lavf.swf
 329479 ./tests/data/b-lavf.swf
diff --git a/tests/seek.regression.ref b/tests/seek.regression.ref
index 97e9e248e5..9d9924abcf 100644
--- a/tests/seek.regression.ref
+++ b/tests/seek.regression.ref
@@ -3599,57 +3599,57 @@ ret:-1         st:-1 flags:1  ts:-0.645825
 tests/data/b-lavf.ts
 ret: 0         st: 0 flags:1 dts: 0.660000 pts: 0.700000 pos:    564 size: 24801
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:0 dts: 0.700000 pts: 0.740000 pos:  29140 size: 16433
+ret: 0         st: 0 flags:0 dts: 0.700000 pts: 0.740000 pos:  28764 size: 16433
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:0 dts: 0.820000 pts: 0.860000 pos:  80088 size: 13388
+ret: 0         st: 0 flags:0 dts: 0.820000 pts: 0.860000 pos:  78960 size: 13388
 ret: 0         st: 0 flags:0  ts: 0.788333
-ret: 0         st: 0 flags:0 dts: 0.740000 pts: 0.780000 pos:  48316 size: 14502
+ret: 0         st: 0 flags:0 dts: 0.740000 pts: 0.780000 pos:  47564 size: 14502
 ret: 0         st: 0 flags:1  ts:-0.317500
-ret: 0         st: 0 flags:0 dts: 0.700000 pts: 0.740000 pos:  29140 size: 16433
+ret: 0         st: 0 flags:1 dts: 0.660000 pts: 0.700000 pos:    564 size: 24801
 ret: 0         st: 1 flags:0  ts: 2.576667
-ret: 0         st: 0 flags:0 dts: 0.900000 pts: 0.940000 pos: 110544 size: 12781
+ret: 0         st: 0 flags:0 dts: 0.900000 pts: 0.940000 pos: 109416 size: 12781
 ret: 0         st: 1 flags:1  ts: 1.470833
-ret: 0         st: 0 flags:0 dts: 0.780000 pts: 0.820000 pos:  65236 size: 12623
+ret: 0         st: 0 flags:0 dts: 0.780000 pts: 0.820000 pos:  64108 size: 12623
 ret: 0         st:-1 flags:0  ts: 0.365002
-ret: 0         st: 0 flags:0 dts: 0.700000 pts: 0.740000 pos:  29140 size: 16433
+ret: 0         st: 0 flags:0 dts: 0.700000 pts: 0.740000 pos:  28764 size: 16433
 ret: 0         st:-1 flags:1  ts:-0.740831
-ret: 0         st: 0 flags:0 dts: 0.700000 pts: 0.740000 pos:  29140 size: 16433
+ret: 0         st: 0 flags:1 dts: 0.660000 pts: 0.700000 pos:    564 size: 24801
 ret: 0         st: 0 flags:0  ts: 2.153333
-ret: 0         st: 0 flags:0 dts: 0.860000 pts: 0.900000 pos:  95128 size: 13086
+ret: 0         st: 0 flags:0 dts: 0.860000 pts: 0.900000 pos:  94188 size: 13086
 ret: 0         st: 0 flags:1  ts: 1.047500
-ret: 0         st: 0 flags:0 dts: 0.740000 pts: 0.780000 pos:  48316 size: 14502
+ret: 0         st: 0 flags:0 dts: 0.740000 pts: 0.780000 pos:  47564 size: 14502
 ret: 0         st: 1 flags:0  ts:-0.058333
-ret: 0         st: 0 flags:0 dts: 0.700000 pts: 0.740000 pos:  29140 size: 16433
+ret: 0         st: 0 flags:0 dts: 0.700000 pts: 0.740000 pos:  28764 size: 16433
 ret: 0         st: 1 flags:1  ts: 2.835833
-ret: 0         st: 0 flags:0 dts: 0.900000 pts: 0.940000 pos: 110544 size: 12781
+ret: 0         st: 0 flags:0 dts: 0.940000 pts: 0.980000 pos: 124080 size: 11944
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:0 dts: 0.780000 pts: 0.820000 pos:  65236 size: 12623
+ret: 0         st: 0 flags:0 dts: 0.820000 pts: 0.860000 pos:  78960 size: 13388
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:0 dts: 0.700000 pts: 0.740000 pos:  29140 size: 16433
+ret: 0         st: 0 flags:0 dts: 0.700000 pts: 0.740000 pos:  28764 size: 16433
 ret: 0         st: 0 flags:0  ts:-0.481667
-ret: 0         st: 0 flags:0 dts: 0.700000 pts: 0.740000 pos:  29140 size: 16433
+ret: 0         st: 0 flags:0 dts: 0.700000 pts: 0.740000 pos:  28764 size: 16433
 ret: 0         st: 0 flags:1  ts: 2.412500
-ret: 0         st: 0 flags:0 dts: 0.860000 pts: 0.900000 pos:  95128 size: 13086
+ret: 0         st: 0 flags:0 dts: 0.900000 pts: 0.940000 pos: 109416 size: 12781
 ret: 0         st: 1 flags:0  ts: 1.306667
-ret: 0         st: 0 flags:0 dts: 0.780000 pts: 0.820000 pos:  65236 size: 12623
+ret: 0         st: 0 flags:0 dts: 0.780000 pts: 0.820000 pos:  64108 size: 12623
 ret: 0         st: 1 flags:1  ts: 0.200844
-ret: 0         st: 0 flags:0 dts: 0.700000 pts: 0.740000 pos:  29140 size: 16433
+ret: 0         st: 0 flags:0 dts: 0.700000 pts: 0.740000 pos:  28764 size: 16433
 ret: 0         st:-1 flags:0  ts:-0.904994
-ret: 0         st: 0 flags:0 dts: 0.700000 pts: 0.740000 pos:  29140 size: 16433
+ret: 0         st: 0 flags:0 dts: 0.700000 pts: 0.740000 pos:  28764 size: 16433
 ret: 0         st:-1 flags:1  ts: 1.989173
-ret: 0         st: 0 flags:0 dts: 0.820000 pts: 0.860000 pos:  80088 size: 13388
+ret: 0         st: 0 flags:0 dts: 0.860000 pts: 0.900000 pos:  94188 size: 13086
 ret: 0         st: 0 flags:0  ts: 0.883344
-ret: 0         st: 0 flags:0 dts: 0.740000 pts: 0.780000 pos:  48316 size: 14502
+ret: 0         st: 0 flags:0 dts: 0.740000 pts: 0.780000 pos:  47564 size: 14502
 ret: 0         st: 0 flags:1  ts:-0.222489
-ret: 0         st: 0 flags:0 dts: 0.700000 pts: 0.740000 pos:  29140 size: 16433
+ret: 0         st: 0 flags:1 dts: 0.660000 pts: 0.700000 pos:    564 size: 24801
 ret: 0         st: 1 flags:0  ts: 2.671678
-ret: 0         st: 0 flags:0 dts: 0.900000 pts: 0.940000 pos: 110544 size: 12781
+ret: 0         st: 0 flags:0 dts: 0.900000 pts: 0.940000 pos: 109416 size: 12781
 ret: 0         st: 1 flags:1  ts: 1.565844
-ret: 0         st: 0 flags:0 dts: 0.780000 pts: 0.820000 pos:  65236 size: 12623
+ret: 0         st: 0 flags:0 dts: 0.780000 pts: 0.820000 pos:  64108 size: 12623
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:0 dts: 0.700000 pts: 0.740000 pos:  29140 size: 16433
+ret: 0         st: 0 flags:0 dts: 0.700000 pts: 0.740000 pos:  28764 size: 16433
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:0 dts: 0.700000 pts: 0.740000 pos:  29140 size: 16433
+ret: 0         st: 0 flags:1 dts: 0.660000 pts: 0.700000 pos:    564 size: 24801
 ----------------
 tests/data/b-lavf.ul
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:  1024