It appears last_pts was not set ...

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

3 files changed, 19 insertions, 18 deletions

diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index f3f8ef9fd7..5c0975c281 100644
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -727,6 +727,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt){
 
     put_buffer(bc, pkt->data + nut->header_len[header_idx], pkt->size - nut->header_len[header_idx]);
     nus->last_flags= flags;
+    nus->last_pts= pkt->pts;
 
     //FIXME just store one per syncpoint
     if(flags & FLAG_KEY)
diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref
index edee7aec09..bb85fe1620 100644
--- a/tests/libav.regression.ref
+++ b/tests/libav.regression.ref
@@ -30,8 +30,8 @@ f8ad5bd78f4d012a8ce9570aa395ac54 *./tests/data/b-libav.flv
 2ba41cf880aa5cb87e8a08fdb735398d *./tests/data/b-libav.gxf
 814640 ./tests/data/b-libav.gxf
 ./tests/data/b-libav.gxf CRC=0xa376c09e
-7e8f5cfb9c1c0ac60260a10e2f72f3ea *./tests/data/b-libav.nut
-329347 ./tests/data/b-libav.nut
+66a6584f9e83e8ea3af822a3ba71fbbe *./tests/data/b-libav.nut
+329264 ./tests/data/b-libav.nut
 ./tests/data/b-libav.nut CRC=0x400c29e9
 43238b15f1012aa27536c2be20bb2383 *./tests/data/b-libav.mkv
 329854 ./tests/data/b-libav.mkv
diff --git a/tests/seek.regression.ref b/tests/seek.regression.ref
index f1d9f97a8c..cb2679b8ef 100644
--- a/tests/seek.regression.ref
+++ b/tests/seek.regression.ref
@@ -3197,53 +3197,53 @@ ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:279 size:28088 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:279 size:28088 flags:1
 ret: 0 st:-1 ts:1.894167 flags:1
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149091 size:27412 flags:1
 ret: 0 st: 0 ts:0.800000 flags:0
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149091 size:27412 flags:1
 ret: 0 st: 0 ts:-0.320000 flags:1
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:279 size:28088 flags:1
 ret: 0 st: 1 ts:2.586122 flags:0
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149091 size:27412 flags:1
 ret: 0 st: 1 ts:1.462857 flags:1
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149091 size:27412 flags:1
 ret: 0 st:-1 ts:0.365002 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:279 size:28088 flags:1
 ret: 0 st:-1 ts:-0.740831 flags:1
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:279 size:28088 flags:1
 ret: 0 st: 0 ts:2.160000 flags:0
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149091 size:27412 flags:1
 ret: 0 st: 0 ts:1.040000 flags:1
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149091 size:27412 flags:1
 ret: 0 st: 1 ts:-0.052245 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:279 size:28088 flags:1
 ret: 0 st: 1 ts:2.847347 flags:1
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149091 size:27412 flags:1
 ret: 0 st:-1 ts:1.730004 flags:0
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149091 size:27412 flags:1
 ret: 0 st:-1 ts:0.624171 flags:1
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149091 size:27412 flags:1
 ret: 0 st: 0 ts:-0.480000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:279 size:28088 flags:1
 ret: 0 st: 0 ts:2.400000 flags:1
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149091 size:27412 flags:1
 ret: 0 st: 1 ts:1.306122 flags:0
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149091 size:27412 flags:1
 ret: 0 st: 1 ts:0.208980 flags:1
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:279 size:28088 flags:1
 ret: 0 st:-1 ts:-0.904994 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:279 size:28088 flags:1
 ret: 0 st:-1 ts:1.989173 flags:1
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149091 size:27412 flags:1
 ret: 0 st: 0 ts:0.880000 flags:0
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149091 size:27412 flags:1
 ret: 0 st: 0 ts:-0.240000 flags:1
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:279 size:28088 flags:1
 ret: 0 st: 1 ts:2.664490 flags:0
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149091 size:27412 flags:1
 ret: 0 st: 1 ts:1.567347 flags:1
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149091 size:27412 flags:1
 ret: 0 st:-1 ts:0.460008 flags:0
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149091 size:27412 flags:1
 ret: 0 st:-1 ts:-0.645825 flags:1
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:279 size:28088 flags:1
 ----------------