From 0c152fe916e3f01ac075c6d86e4778e11f807042 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 18 May 2014 22:51:27 +0200 Subject: ffmpeg: prefix encoder with "Lavc " in bitexact mode This avoids misleading encoder names like "encoder = prores" Signed-off-by: Michael Niedermayer --- tests/ref/seek/lavf-mkv | 44 ++++++++++++++++++++-------------------- tests/ref/seek/lavf-nut | 54 ++++++++++++++++++++++++------------------------- tests/ref/seek/lavf-ogg | 54 ++++++++++++++++++++++++------------------------- 3 files changed, 76 insertions(+), 76 deletions(-) (limited to 'tests/ref/seek') diff --git a/tests/ref/seek/lavf-mkv b/tests/ref/seek/lavf-mkv index 582e12a233..11275d6e4c 100644 --- a/tests/ref/seek/lavf-mkv +++ b/tests/ref/seek/lavf-mkv @@ -1,48 +1,48 @@ -ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 651 size: 208 +ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 661 size: 208 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 867 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 877 size: 27837 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292281 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292291 size: 27834 ret: 0 st: 0 flags:0 ts: 0.788000 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292281 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292291 size: 27834 ret: 0 st: 0 flags:1 ts:-0.317000 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 867 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 877 size: 27837 ret:-1 st: 1 flags:0 ts: 2.577000 ret: 0 st: 1 flags:1 ts: 1.471000 -ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320122 size: 209 +ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320132 size: 209 ret: 0 st:-1 flags:0 ts: 0.365002 -ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146834 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146844 size: 27925 ret: 0 st:-1 flags:1 ts:-0.740831 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 867 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 877 size: 27837 ret:-1 st: 0 flags:0 ts: 2.153000 ret: 0 st: 0 flags:1 ts: 1.048000 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292281 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292291 size: 27834 ret: 0 st: 1 flags:0 ts:-0.058000 -ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 651 size: 208 +ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 661 size: 208 ret: 0 st: 1 flags:1 ts: 2.836000 -ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320122 size: 209 +ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320132 size: 209 ret:-1 st:-1 flags:0 ts: 1.730004 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146834 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146844 size: 27925 ret: 0 st: 0 flags:0 ts:-0.482000 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 867 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 877 size: 27837 ret: 0 st: 0 flags:1 ts: 2.413000 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292281 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292291 size: 27834 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: 0.000000 pts: 0.000000 pos: 651 size: 208 +ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 661 size: 208 ret: 0 st:-1 flags:0 ts:-0.904994 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 867 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 877 size: 27837 ret: 0 st:-1 flags:1 ts: 1.989173 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292281 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292291 size: 27834 ret: 0 st: 0 flags:0 ts: 0.883000 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292281 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292291 size: 27834 ret: 0 st: 0 flags:1 ts:-0.222000 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 867 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 877 size: 27837 ret:-1 st: 1 flags:0 ts: 2.672000 ret: 0 st: 1 flags:1 ts: 1.566000 -ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320122 size: 209 +ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320132 size: 209 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146834 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146844 size: 27925 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 867 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 877 size: 27837 diff --git a/tests/ref/seek/lavf-nut b/tests/ref/seek/lavf-nut index 73a3521c39..b2da52629b 100644 --- a/tests/ref/seek/lavf-nut +++ b/tests/ref/seek/lavf-nut @@ -1,53 +1,53 @@ -ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 385 size: 208 +ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 395 size: 208 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 613 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 623 size: 27837 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146480 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146490 size: 27925 ret: 0 st: 0 flags:0 ts: 0.788340 -ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146480 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146490 size: 27925 ret: 0 st: 0 flags:1 ts:-0.317500 -ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 613 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 623 size: 27837 ret: 0 st: 1 flags:0 ts: 2.576667 -ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271305 size: 209 +ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271315 size: 209 ret: 0 st: 1 flags:1 ts: 1.470839 -ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271305 size: 209 +ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271315 size: 209 ret: 0 st:-1 flags:0 ts: 0.365002 -ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146480 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146490 size: 27925 ret: 0 st:-1 flags:1 ts:-0.740831 -ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 613 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 623 size: 27837 ret: 0 st: 0 flags:0 ts: 2.153340 -ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146480 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146490 size: 27925 ret: 0 st: 0 flags:1 ts: 1.047500 -ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146480 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146490 size: 27925 ret: 0 st: 1 flags:0 ts:-0.058322 -ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 385 size: 208 +ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 395 size: 208 ret: 0 st: 1 flags:1 ts: 2.835828 -ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271305 size: 209 +ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271315 size: 209 ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146480 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146490 size: 27925 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146480 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146490 size: 27925 ret: 0 st: 0 flags:0 ts:-0.481660 -ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 613 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 623 size: 27837 ret: 0 st: 0 flags:1 ts: 2.412500 -ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146480 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146490 size: 27925 ret: 0 st: 1 flags:0 ts: 1.306667 -ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271305 size: 209 +ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271315 size: 209 ret: 0 st: 1 flags:1 ts: 0.200839 -ret: 0 st: 1 flags:1 dts: 0.182857 pts: 0.182857 pos: 71947 size: 209 +ret: 0 st: 1 flags:1 dts: 0.182857 pts: 0.182857 pos: 71957 size: 209 ret: 0 st:-1 flags:0 ts:-0.904994 -ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 613 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 623 size: 27837 ret: 0 st:-1 flags:1 ts: 1.989173 -ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146480 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146490 size: 27925 ret: 0 st: 0 flags:0 ts: 0.883340 -ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146480 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146490 size: 27925 ret: 0 st: 0 flags:1 ts:-0.222500 -ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 613 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 623 size: 27837 ret: 0 st: 1 flags:0 ts: 2.671678 -ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271305 size: 209 +ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271315 size: 209 ret: 0 st: 1 flags:1 ts: 1.565850 -ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271305 size: 209 +ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271315 size: 209 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146480 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146490 size: 27925 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 613 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 623 size: 27837 diff --git a/tests/ref/seek/lavf-ogg b/tests/ref/seek/lavf-ogg index 736ad70e9b..caf4879075 100644 --- a/tests/ref/seek/lavf-ogg +++ b/tests/ref/seek/lavf-ogg @@ -1,53 +1,53 @@ -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 ret: 0 st: 0 flags:0 ts: 0.788345 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 ret: 0 st: 0 flags:1 ts:-0.317506 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 ret: 0 st:-1 flags:0 ts: 2.576668 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 ret: 0 st:-1 flags:1 ts: 1.470835 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 ret: 0 st: 0 flags:0 ts: 0.365011 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 ret: 0 st: 0 flags:1 ts:-0.740839 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 ret: 0 st:-1 flags:0 ts: 2.153336 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 ret: 0 st:-1 flags:1 ts: 1.047503 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 ret: 0 st: 0 flags:0 ts:-0.058322 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 ret: 0 st: 0 flags:1 ts: 2.835828 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 ret: 0 st: 0 flags:0 ts:-0.481655 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 ret: 0 st: 0 flags:1 ts: 2.412494 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 ret: 0 st:-1 flags:0 ts: 1.306672 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 ret: 0 st:-1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 ret: 0 st: 0 flags:0 ts:-0.904989 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 ret: 0 st: 0 flags:1 ts: 1.989184 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 ret: 0 st:-1 flags:0 ts: 0.883340 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 ret: 0 st:-1 flags:1 ts:-0.222493 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 ret: 0 st: 0 flags:0 ts: 2.671678 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 ret: 0 st: 0 flags:1 ts: 1.565850 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 159 size: 1364 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 164 size: 1364 -- cgit v1.2.3