also fix related fate tests
---
I noticed a bad typo in the file, so I propose a simplification of the whole
check.
I'm not 100% the fix is the correct one as many fate test had to be redone
(attached).
Cheers,
Vittorio
libavcodec/mpegvideo_enc.c | 13 ++++---------
tests/ref/lavf/ffm | 2 +-
tests/ref/lavf/mpg | 2 +-
tests/ref/lavf/ts | 2 +-
tests/ref/seek/lavf-ffm | 36 ++++++++++++++++++------------------
tests/ref/seek/lavf-mpg | 24 ++++++++++++------------
tests/ref/seek/lavf-ts | 40 ++++++++++++++++++++--------------------
7 files changed, 57 insertions(+), 62 deletions(-)
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index c245996..9bb1fa6 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -865,16 +865,11 @@ static int load_input_picture(MpegEncContext *s, const
AVFrame *pic_arg)
pts = display_picture_number;
}
}
- }
- if (pic_arg) {
- if (!pic_arg->buf[0]);
- direct = 0;
- if (pic_arg->linesize[0] != s->linesize)
- direct = 0;
- if (pic_arg->linesize[1] != s->uvlinesize)
- direct = 0;
- if (pic_arg->linesize[2] != s->uvlinesize)
+ if (!pic_arg->buf[0] ||
+ pic_arg->linesize[0] != s->linesize ||
+ pic_arg->linesize[1] != s->uvlinesize ||
+ pic_arg->linesize[2] != s->uvlinesize)
direct = 0;
av_dlog(s->avctx, "%d %d %td %td\n", pic_arg->linesize[0],
diff --git a/tests/ref/lavf/ffm b/tests/ref/lavf/ffm
index 7518a81..4e2ed75 100644
--- a/tests/ref/lavf/ffm
+++ b/tests/ref/lavf/ffm
@@ -1,3 +1,3 @@
-f3f0c42283b75bc826f499f048085c27 *./tests/data/lavf/lavf.ffm
+cf3126d063fab1112479bb79627d17cd *./tests/data/lavf/lavf.ffm
376832 ./tests/data/lavf/lavf.ffm
./tests/data/lavf/lavf.ffm CRC=0xdd24439e
diff --git a/tests/ref/lavf/mpg b/tests/ref/lavf/mpg
index e4c8ae0..c197454 100644
--- a/tests/ref/lavf/mpg
+++ b/tests/ref/lavf/mpg
@@ -1,3 +1,3 @@
-7df31ba8a5909e3c88b1d1a3f93c4ec2 *./tests/data/lavf/lavf.mpg
+3ecc8947d030ea942781f8206bf56311 *./tests/data/lavf/lavf.mpg
372736 ./tests/data/lavf/lavf.mpg
./tests/data/lavf/lavf.mpg CRC=0xdd24439e
diff --git a/tests/ref/lavf/ts b/tests/ref/lavf/ts
index 0fe358b..ef0179f 100644
--- a/tests/ref/lavf/ts
+++ b/tests/ref/lavf/ts
@@ -1,3 +1,3 @@
-647875edb0d1afb9fd0477cbfde3fe8b *./tests/data/lavf/lavf.ts
+5df3664a5814dd67cced2e956a1497dd *./tests/data/lavf/lavf.ts
406456 ./tests/data/lavf/lavf.ts
./tests/data/lavf/lavf.ts CRC=0xb4ca6cdc
diff --git a/tests/ref/seek/lavf-ffm b/tests/ref/seek/lavf-ffm
index 2597220..3d2bd17 100644
--- a/tests/ref/seek/lavf-ffm
+++ b/tests/ref/seek/lavf-ffm
@@ -2,52 +2,52 @@ ret: 0 st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:
8192 size: 24664
ret: 0 st:-1 flags:0 ts:-1.000000
ret: 0 st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos: 8192 size:
24664
ret: 0 st:-1 flags:1 ts: 1.894167
-ret: 0 st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:
209
+ret: 0 st: 1 flags:1 dts: 0.851134 pts: 0.851134 pos: 376832 size:
209
ret: 0 st: 0 flags:0 ts: 0.788334
-ret: 0 st: 1 flags:1 dts: 0.772766 pts: 0.772766 pos: 315392 size:
209
+ret: 0 st: 1 flags:1 dts: 0.380930 pts: 0.380930 pos: 372736 size:
209
ret: 0 st: 0 flags:1 ts:-0.317499
ret: 0 st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos: 8192 size:
24664
ret: 0 st: 1 flags:0 ts: 2.576668
-ret: 0 st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:
209
+ret: 0 st: 1 flags:1 dts: 0.851134 pts: 0.851134 pos: 376832 size:
209
ret: 0 st: 1 flags:1 ts: 1.470835
-ret: 0 st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:
209
+ret: 0 st: 1 flags:1 dts: 0.851134 pts: 0.851134 pos: 376832 size:
209
ret: 0 st:-1 flags:0 ts: 0.365002
-ret: 0 st: 1 flags:1 dts: 0.328685 pts: 0.328685 pos: 155648 size:
209
+ret: 0 st: 1 flags:1 dts: 0.015215 pts: 0.015215 pos: 368640 size:
209
ret: 0 st:-1 flags:1 ts:-0.740831
ret: 0 st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos: 8192 size:
24664
ret: 0 st: 0 flags:0 ts: 2.153336
-ret: 0 st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:
209
+ret: 0 st: 1 flags:1 dts: 0.851134 pts: 0.851134 pos: 376832 size:
209
ret: 0 st: 0 flags:1 ts: 1.047503
-ret: 0 st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:
209
+ret: 0 st: 1 flags:1 dts: 0.851134 pts: 0.851134 pos: 376832 size:
209
ret: 0 st: 1 flags:0 ts:-0.058330
ret: 0 st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos: 8192 size:
24664
ret: 0 st: 1 flags:1 ts: 2.835837
-ret: 0 st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:
209
+ret: 0 st: 1 flags:1 dts: 0.851134 pts: 0.851134 pos: 376832 size:
209
ret: 0 st:-1 flags:0 ts: 1.730004
-ret: 0 st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:
209
+ret: 0 st: 1 flags:1 dts: 0.851134 pts: 0.851134 pos: 376832 size:
209
ret: 0 st:-1 flags:1 ts: 0.624171
-ret: 0 st: 1 flags:1 dts: 0.642154 pts: 0.642154 pos: 274432 size:
209
+ret: 0 st: 1 flags:1 dts: 0.851134 pts: 0.851134 pos: 376832 size:
209
ret: 0 st: 0 flags:0 ts:-0.481662
ret: 0 st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos: 8192 size:
24664
ret: 0 st: 0 flags:1 ts: 2.412505
-ret: 0 st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:
209
+ret: 0 st: 1 flags:1 dts: 0.851134 pts: 0.851134 pos: 376832 size:
209
ret: 0 st: 1 flags:0 ts: 1.306672
-ret: 0 st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:
209
+ret: 0 st: 1 flags:1 dts: 0.851134 pts: 0.851134 pos: 376832 size:
209
ret: 0 st: 1 flags:1 ts: 0.200839
-ret: 0 st: 1 flags:1 dts: 0.224195 pts: 0.224195 pos: 114688 size:
209
+ret: 0 st: 1 flags:1 dts: 0.380930 pts: 0.380930 pos: 372736 size:
209
ret: 0 st:-1 flags:0 ts:-0.904994
ret: 0 st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos: 8192 size:
24664
ret: 0 st:-1 flags:1 ts: 1.989173
-ret: 0 st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:
209
+ret: 0 st: 1 flags:1 dts: 0.851134 pts: 0.851134 pos: 376832 size:
209
ret: 0 st: 0 flags:0 ts: 0.883340
-ret: 0 st: 1 flags:1 dts: 0.877256 pts: 0.877256 pos: 339968 size:
209
+ret: 0 st: 1 flags:1 dts: 0.851134 pts: 0.851134 pos: 376832 size:
209
ret: 0 st: 0 flags:1 ts:-0.222493
ret: 0 st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos: 8192 size:
24664
ret: 0 st: 1 flags:0 ts: 2.671674
-ret: 0 st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:
209
+ret: 0 st: 1 flags:1 dts: 0.851134 pts: 0.851134 pos: 376832 size:
209
ret: 0 st: 1 flags:1 ts: 1.565841
-ret: 0 st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:
209
+ret: 0 st: 1 flags:1 dts: 0.851134 pts: 0.851134 pos: 376832 size:
209
ret: 0 st:-1 flags:0 ts: 0.460008
-ret: 0 st: 1 flags:1 dts: 0.459297 pts: 0.459297 pos: 204800 size:
209
+ret: 0 st: 1 flags:1 dts: 0.380930 pts: 0.380930 pos: 372736 size:
209
ret: 0 st:-1 flags:1 ts:-0.645825
ret: 0 st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos: 8192 size:
24664
diff --git a/tests/ref/seek/lavf-mpg b/tests/ref/seek/lavf-mpg
index 6e27064..a8b2572 100644
--- a/tests/ref/seek/lavf-mpg
+++ b/tests/ref/seek/lavf-mpg
@@ -2,51 +2,51 @@ ret: 0 st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:
2048 size: 208
ret: 0 st:-1 flags:0 ts:-1.000000
ret: 0 st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos: 2048 size:
208
ret: 0 st:-1 flags:1 ts: 1.894167
-ret: 0 st: 0 flags:0 dts: 1.880000 pts: 1.920000 pos: 315392 size:
12800
+ret: 0 st: 1 flags:1 dts: 1.551544 pts: 1.551544 pos: 366604 size:
326
ret: 0 st: 0 flags:0 ts: 0.788333
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:
391
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: 237580 size:
261
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
ret: 0 st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos: 2048 size:
208
ret: 0 st: 0 flags:0 ts: 2.153333
-ret: 0 st: 0 flags:1 dts: 1.960000 pts: 2.000000 pos: 339968 size:
681
+ret: 0 st: 1 flags:1 dts: 1.551544 pts: 1.551544 pos: 366604 size:
326
ret: 0 st: 0 flags:1 ts: 1.047500
-ret: 0 st: 0 flags:0 dts: 1.040000 pts: 1.080000 pos: 26624 size:
16303
+ret: 0 st: 1 flags:1 dts: 1.551544 pts: 1.551544 pos: 366604 size:
326
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:
391
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 dts: 1.551544 pts: 1.551544 pos: 366604 size:
326
ret: 0 st:-1 flags:1 ts: 0.624171
ret: 0 st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos: 2048 size:
208
ret: 0 st: 0 flags:0 ts:-0.481667
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:1 dts: 1.551544 pts: 1.551544 pos: 366604 size:
326
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: 366604 size:
326
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
ret: 0 st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos: 2048 size:
208
ret: 0 st:-1 flags:1 ts: 1.989173
-ret: 0 st: 0 flags:1 dts: 1.960000 pts: 2.000000 pos: 339968 size:
681
+ret: 0 st: 1 flags:1 dts: 1.551544 pts: 1.551544 pos: 366604 size:
326
ret: 0 st: 0 flags:0 ts: 0.883344
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:
391
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: 366604 size:
326
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 df7c4af..8af9590 100644
--- a/tests/ref/seek/lavf-ts
+++ b/tests/ref/seek/lavf-ts
@@ -1,53 +1,53 @@
ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size:
24801
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: 0 flags:0 dts: 1.440011 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: 1.429089 pts: 1.429089 pos: 397620 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: 1 flags:1 dts: 1.429089 pts: 1.429089 pos: 397620 size:
208
ret: 0 st: 0 flags:1 ts:-0.317500
ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size:
24801
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: 1.429089 pts: 1.429089 pos: 397620 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:1 dts: 1.429089 pts: 1.429089 pos: 397620 size:
208
ret: 0 st:-1 flags:0 ts: 0.365002
-ret: 0 st: 0 flags:0 dts: 1.480000 pts: 1.520000 pos: 44932 size:
14502
+ret: 0 st: 0 flags:0 dts: 1.440011 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:
24801
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: 1.429089 pts: 1.429089 pos: 397620 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:1 dts: 1.429089 pts: 1.429089 pos: 397620 size:
208
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: 0 flags:0 dts: 1.440011 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: 1.429089 pts: 1.429089 pos: 397620 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: 1.429089 pts: 1.429089 pos: 397620 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:
24801
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:0 dts: 1.440011 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: 1.429089 pts: 1.429089 pos: 397620 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 dts: 1.429089 pts: 1.429089 pos: 397620 size:
208
ret: 0 st: 1 flags:1 ts: 0.200844
ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size:
24801
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: 0 flags:0 dts: 1.440011 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: 1.429089 pts: 1.429089 pos: 397620 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: 1 flags:1 dts: 1.429089 pts: 1.429089 pos: 397620 size:
208
ret: 0 st: 0 flags:1 ts:-0.222489
ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size:
24801
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: 1.429089 pts: 1.429089 pos: 397620 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:1 dts: 1.429089 pts: 1.429089 pos: 397620 size:
208
ret: 0 st:-1 flags:0 ts: 0.460008
-ret: 0 st: 0 flags:0 dts: 1.480000 pts: 1.520000 pos: 44932 size:
14502
+ret: 0 st: 0 flags:0 dts: 1.440011 pts: 1.520000 pos: 44932 size:
14502
ret: 0 st:-1 flags:1 ts:-0.645825
ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size:
24801
--
1.8.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
