CC: [email protected]
Bug-Id: CID 29261
---
libavformat/mpegenc.c | 2 +-
tests/ref/lavf/mpg | 6 +++---
tests/ref/lavf/ts | 4 ++--
tests/ref/seek/lavf-mpg | 12 ++++++------
tests/ref/seek/lavf-ts | 16 ++++++++--------
5 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index fed03ed..9640893 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -1057,7 +1057,7 @@ retry:
es_size -= stream->premux_packet->unwritten_size;
stream->premux_packet = stream->premux_packet->next;
}
- if (es_size)
+ if (stream->premux_packet && es_size)
stream->premux_packet->unwritten_size -= es_size;
if (remove_decoded_packets(ctx, s->last_scr) < 0)
diff --git a/tests/ref/lavf/mpg b/tests/ref/lavf/mpg
index e4c8ae0..400f3fa 100644
--- a/tests/ref/lavf/mpg
+++ b/tests/ref/lavf/mpg
@@ -1,3 +1,3 @@
-7df31ba8a5909e3c88b1d1a3f93c4ec2 *./tests/data/lavf/lavf.mpg
-372736 ./tests/data/lavf/lavf.mpg
-./tests/data/lavf/lavf.mpg CRC=0xdd24439e
+6130e03eb58b397b0e93768ce1fe8bc2 *./tests/data/lavf/lavf.mpg
+370688 ./tests/data/lavf/lavf.mpg
+./tests/data/lavf/lavf.mpg CRC=0x756e6236
diff --git a/tests/ref/lavf/ts b/tests/ref/lavf/ts
index 8512d26..f1add23 100644
--- a/tests/ref/lavf/ts
+++ b/tests/ref/lavf/ts
@@ -1,3 +1,3 @@
-3713c852d6ee217ae6a901619df71111 *./tests/data/lavf/lavf.ts
+f1469610cf1d92b0b57f3e7602cc80ca *./tests/data/lavf/lavf.ts
406456 ./tests/data/lavf/lavf.ts
-./tests/data/lavf/lavf.ts CRC=0xb4ca6cdc
+./tests/data/lavf/lavf.ts CRC=0x4d148b74
diff --git a/tests/ref/seek/lavf-mpg b/tests/ref/seek/lavf-mpg
index 6e27064..76cdd51 100644
--- a/tests/ref/seek/lavf-mpg
+++ b/tests/ref/seek/lavf-mpg
@@ -8,9 +8,9 @@ ret: 0 st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:
2048 size: 208
ret: 0 st: 0 flags:1 ts:-0.317500
ret: 0 st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos: 2048 size:
208
ret: 0 st: 1 flags:0 ts: 2.576667
-ret: 0 st: 1 flags:1 dts: 1.812767 pts: 1.812767 pos: 368652 size:
379
+ret: 0 st: 1 flags:1 dts: 1.812767 pts: 1.812767 pos: 368652 size:
349
ret: 0 st: 1 flags:1 ts: 1.470833
-ret: 0 st: 1 flags:1 dts: 1.290322 pts: 1.290322 pos: 145408 size:
261
+ret: 0 st: 1 flags:1 dts: 1.290322 pts: 1.290322 pos: 145408 size:
251
ret: 0 st:-1 flags:0 ts: 0.365002
ret: 0 st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos: 2048 size:
208
ret: 0 st:-1 flags:1 ts:-0.740831
@@ -22,7 +22,7 @@ ret: 0 st: 0 flags:0 dts: 1.040000 pts: 1.080000 pos:
26624 size: 16303
ret: 0 st: 1 flags:0 ts:-0.058333
ret: 0 st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos: 2048 size:
208
ret: 0 st: 1 flags:1 ts: 2.835833
-ret: 0 st: 1 flags:1 dts: 1.812767 pts: 1.812767 pos: 368652 size:
379
+ret: 0 st: 1 flags:1 dts: 1.812767 pts: 1.812767 pos: 368652 size:
349
ret: 0 st:-1 flags:0 ts: 1.730004
ret: 0 st: 0 flags:0 dts: 1.760000 pts: 1.800000 pos: 280588 size:
13050
ret: 0 st:-1 flags:1 ts: 0.624171
@@ -32,7 +32,7 @@ ret: 0 st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:
2048 size: 208
ret: 0 st: 0 flags:1 ts: 2.412500
ret: 0 st: 0 flags:1 dts: 1.960000 pts: 2.000000 pos: 339968 size:
681
ret: 0 st: 1 flags:0 ts: 1.306667
-ret: 0 st: 1 flags:1 dts: 1.551544 pts: 1.551544 pos: 342028 size:
314
+ret: 0 st: 1 flags:1 dts: 1.551544 pts: 1.551544 pos: 342028 size:
294
ret: 0 st: 1 flags:1 ts: 0.200844
ret: 0 st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos: 2048 size:
208
ret: 0 st:-1 flags:0 ts:-0.904994
@@ -44,9 +44,9 @@ ret: 0 st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:
2048 size: 208
ret: 0 st: 0 flags:1 ts:-0.222489
ret: 0 st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos: 2048 size:
208
ret: 0 st: 1 flags:0 ts: 2.671678
-ret: 0 st: 1 flags:1 dts: 1.812767 pts: 1.812767 pos: 368652 size:
379
+ret: 0 st: 1 flags:1 dts: 1.812767 pts: 1.812767 pos: 368652 size:
349
ret: 0 st: 1 flags:1 ts: 1.565844
-ret: 0 st: 1 flags:1 dts: 1.551544 pts: 1.551544 pos: 342028 size:
314
+ret: 0 st: 1 flags:1 dts: 1.551544 pts: 1.551544 pos: 342028 size:
294
ret: 0 st:-1 flags:0 ts: 0.460008
ret: 0 st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos: 2048 size:
208
ret: 0 st:-1 flags:1 ts:-0.645825
diff --git a/tests/ref/seek/lavf-ts b/tests/ref/seek/lavf-ts
index b31fab0..f414e52 100644
--- a/tests/ref/seek/lavf-ts
+++ b/tests/ref/seek/lavf-ts
@@ -2,13 +2,13 @@ ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:
564 size: 24813
ret: 0 st:-1 flags:0 ts:-1.000000
ret: 0 st: 0 flags:0 dts: 1.480000 pts: 1.520000 pos: 44932 size:
14502
ret: 0 st:-1 flags:1 ts: 1.894167
-ret: 0 st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:
209
+ret: 0 st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:
208
ret: 0 st: 0 flags:0 ts: 0.788333
ret: 0 st: 0 flags:0 dts: 1.560000 pts: 1.600000 pos: 74260 size:
13388
ret: 0 st: 0 flags:1 ts:-0.317500
ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size:
24813
ret: 0 st: 1 flags:0 ts: 2.576667
-ret: 0 st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:
209
+ret: 0 st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:
208
ret: 0 st: 1 flags:1 ts: 1.470833
ret: 0 st: 0 flags:0 dts: 2.120000 pts: 2.160000 pos: 294032 size:
13839
ret: 0 st:-1 flags:0 ts: 0.365002
@@ -16,21 +16,21 @@ ret: 0 st: 0 flags:0 dts: 1.480000 pts: 1.520000
pos: 44932 size: 14502
ret: 0 st:-1 flags:1 ts:-0.740831
ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size:
24813
ret: 0 st: 0 flags:0 ts: 2.153333
-ret: 0 st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:
209
+ret: 0 st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:
208
ret: 0 st: 0 flags:1 ts: 1.047500
ret: 0 st: 0 flags:0 dts: 1.720000 pts: 1.760000 pos: 130096 size:
14133
ret: 0 st: 1 flags:0 ts:-0.058333
ret: 0 st: 0 flags:0 dts: 1.480000 pts: 1.520000 pos: 44932 size:
14502
ret: 0 st: 1 flags:1 ts: 2.835833
-ret: 0 st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:
209
+ret: 0 st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:
208
ret: 0 st:-1 flags:0 ts: 1.730004
-ret: 0 st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:
209
+ret: 0 st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:
208
ret: 0 st:-1 flags:1 ts: 0.624171
ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size:
24813
ret: 0 st: 0 flags:0 ts:-0.481667
ret: 0 st: 0 flags:0 dts: 1.480000 pts: 1.520000 pos: 44932 size:
14502
ret: 0 st: 0 flags:1 ts: 2.412500
-ret: 0 st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:
209
+ret: 0 st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:
208
ret: 0 st: 1 flags:0 ts: 1.306667
ret: 0 st: 0 flags:0 dts: 2.040000 pts: 2.080000 pos: 265644 size:
12390
ret: 0 st: 1 flags:1 ts: 0.200844
@@ -38,13 +38,13 @@ ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000
pos: 564 size: 24813
ret: 0 st:-1 flags:0 ts:-0.904994
ret: 0 st: 0 flags:0 dts: 1.480000 pts: 1.520000 pos: 44932 size:
14502
ret: 0 st:-1 flags:1 ts: 1.989173
-ret: 0 st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:
209
+ret: 0 st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:
208
ret: 0 st: 0 flags:0 ts: 0.883344
ret: 0 st: 0 flags:0 dts: 1.640000 pts: 1.680000 pos: 102836 size:
12781
ret: 0 st: 0 flags:1 ts:-0.222489
ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size:
24813
ret: 0 st: 1 flags:0 ts: 2.671678
-ret: 0 st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:
209
+ret: 0 st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:
208
ret: 0 st: 1 flags:1 ts: 1.565844
ret: 0 st: 0 flags:0 dts: 2.200000 pts: 2.240000 pos: 325240 size:
12679
ret: 0 st:-1 flags:0 ts: 0.460008
--
1.9.3 (Apple Git-50)
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
