ffmpeg: Skip writing the version when -flags bitexact is used

Alternatively every fate test could be changed to pass both fflags and flags +bitexact

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 33 insertions, 33 deletions

diff --git a/tests/ref/fate/ffprobe_json b/tests/ref/fate/ffprobe_json
index b3b89cab33..48fea24716 100644
--- a/tests/ref/fate/ffprobe_json
+++ b/tests/ref/fate/ffprobe_json
@@ -11,7 +11,7 @@
             "duration": 1024,
             "duration_time": "0.023220",
             "size": "2048",
-            "pos": "669",
+            "pos": "627",
             "flags": "K"
         },
         {
@@ -26,7 +26,7 @@
             "best_effort_timestamp_time": "0.000000",
             "pkt_duration": 1024,
             "pkt_duration_time": "0.023220",
-            "pkt_pos": "669",
+            "pkt_pos": "627",
             "pkt_size": "2048",
             "sample_fmt": "s16",
             "nb_samples": 1024,
@@ -43,7 +43,7 @@
             "duration": 2048,
             "duration_time": "0.040000",
             "size": "230400",
-            "pos": "2744",
+            "pos": "2702",
             "flags": "K"
         },
         {
@@ -58,7 +58,7 @@
             "best_effort_timestamp_time": "0.000000",
             "pkt_duration": 2048,
             "pkt_duration_time": "0.040000",
-            "pkt_pos": "2744",
+            "pkt_pos": "2702",
             "pkt_size": "230400",
             "width": 320,
             "height": 240,
@@ -82,7 +82,7 @@
             "duration": 2048,
             "duration_time": "0.040000",
             "size": "30000",
-            "pos": "233165",
+            "pos": "233123",
             "flags": "K"
         },
         {
@@ -97,7 +97,7 @@
             "best_effort_timestamp_time": "0.000000",
             "pkt_duration": 2048,
             "pkt_duration_time": "0.040000",
-            "pkt_pos": "233165",
+            "pkt_pos": "233123",
             "pkt_size": "30000",
             "width": 100,
             "height": 100,
@@ -121,7 +121,7 @@
             "duration": 1024,
             "duration_time": "0.023220",
             "size": "2048",
-            "pos": "263170",
+            "pos": "263128",
             "flags": "K"
         },
         {
@@ -136,7 +136,7 @@
             "best_effort_timestamp_time": "0.023220",
             "pkt_duration": 1024,
             "pkt_duration_time": "0.023220",
-            "pkt_pos": "263170",
+            "pkt_pos": "263128",
             "pkt_size": "2048",
             "sample_fmt": "s16",
             "nb_samples": 1024,
@@ -153,7 +153,7 @@
             "duration": 2048,
             "duration_time": "0.040000",
             "size": "230400",
-            "pos": "265248",
+            "pos": "265206",
             "flags": "K"
         },
         {
@@ -168,7 +168,7 @@
             "best_effort_timestamp_time": "0.040000",
             "pkt_duration": 2048,
             "pkt_duration_time": "0.040000",
-            "pkt_pos": "265248",
+            "pkt_pos": "265206",
             "pkt_size": "230400",
             "width": 320,
             "height": 240,
@@ -192,7 +192,7 @@
             "duration": 2048,
             "duration_time": "0.040000",
             "size": "30000",
-            "pos": "495672",
+            "pos": "495630",
             "flags": "K"
         },
         {
@@ -207,7 +207,7 @@
             "best_effort_timestamp_time": "0.040000",
             "pkt_duration": 2048,
             "pkt_duration_time": "0.040000",
-            "pkt_pos": "495672",
+            "pkt_pos": "495630",
             "pkt_size": "30000",
             "width": 100,
             "height": 100,
@@ -231,7 +231,7 @@
             "duration": 1024,
             "duration_time": "0.023220",
             "size": "2048",
-            "pos": "525677",
+            "pos": "525635",
             "flags": "K"
         },
         {
@@ -246,7 +246,7 @@
             "best_effort_timestamp_time": "0.046440",
             "pkt_duration": 1024,
             "pkt_duration_time": "0.023220",
-            "pkt_pos": "525677",
+            "pkt_pos": "525635",
             "pkt_size": "2048",
             "sample_fmt": "s16",
             "nb_samples": 1024,
@@ -263,7 +263,7 @@
             "duration": 1024,
             "duration_time": "0.023220",
             "size": "2048",
-            "pos": "527748",
+            "pos": "527706",
             "flags": "K"
         },
         {
@@ -278,7 +278,7 @@
             "best_effort_timestamp_time": "0.069660",
             "pkt_duration": 1024,
             "pkt_duration_time": "0.023220",
-            "pkt_pos": "527748",
+            "pkt_pos": "527706",
             "pkt_size": "2048",
             "sample_fmt": "s16",
             "nb_samples": 1024,
@@ -295,7 +295,7 @@
             "duration": 2048,
             "duration_time": "0.040000",
             "size": "230400",
-            "pos": "529826",
+            "pos": "529784",
             "flags": "K"
         },
         {
@@ -310,7 +310,7 @@
             "best_effort_timestamp_time": "0.080000",
             "pkt_duration": 2048,
             "pkt_duration_time": "0.040000",
-            "pkt_pos": "529826",
+            "pkt_pos": "529784",
             "pkt_size": "230400",
             "width": 320,
             "height": 240,
@@ -334,7 +334,7 @@
             "duration": 2048,
             "duration_time": "0.040000",
             "size": "30000",
-            "pos": "760250",
+            "pos": "760208",
             "flags": "K"
         },
         {
@@ -349,7 +349,7 @@
             "best_effort_timestamp_time": "0.080000",
             "pkt_duration": 2048,
             "pkt_duration_time": "0.040000",
-            "pkt_pos": "760250",
+            "pkt_pos": "760208",
             "pkt_size": "30000",
             "width": 100,
             "height": 100,
@@ -373,7 +373,7 @@
             "duration": 1024,
             "duration_time": "0.023220",
             "size": "2048",
-            "pos": "790255",
+            "pos": "790213",
             "flags": "K"
         },
         {
@@ -388,7 +388,7 @@
             "best_effort_timestamp_time": "0.092880",
             "pkt_duration": 1024,
             "pkt_duration_time": "0.023220",
-            "pkt_pos": "790255",
+            "pkt_pos": "790213",
             "pkt_size": "2048",
             "sample_fmt": "s16",
             "nb_samples": 1024,
@@ -405,7 +405,7 @@
             "duration": 1024,
             "duration_time": "0.023220",
             "size": "2048",
-            "pos": "792326",
+            "pos": "792284",
             "flags": "K"
         },
         {
@@ -420,7 +420,7 @@
             "best_effort_timestamp_time": "0.116100",
             "pkt_duration": 1024,
             "pkt_duration_time": "0.023220",
-            "pkt_pos": "792326",
+            "pkt_pos": "792284",
             "pkt_size": "2048",
             "sample_fmt": "s16",
             "nb_samples": 1024,
@@ -437,7 +437,7 @@
             "duration": 2048,
             "duration_time": "0.040000",
             "size": "230400",
-            "pos": "794404",
+            "pos": "794362",
             "flags": "K"
         },
         {
@@ -452,7 +452,7 @@
             "best_effort_timestamp_time": "0.120000",
             "pkt_duration": 2048,
             "pkt_duration_time": "0.040000",
-            "pkt_pos": "794404",
+            "pkt_pos": "794362",
             "pkt_size": "230400",
             "width": 320,
             "height": 240,
@@ -476,7 +476,7 @@
             "duration": 2048,
             "duration_time": "0.040000",
             "size": "30000",
-            "pos": "1024828",
+            "pos": "1024786",
             "flags": "K"
         },
         {
@@ -491,7 +491,7 @@
             "best_effort_timestamp_time": "0.120000",
             "pkt_duration": 2048,
             "pkt_duration_time": "0.040000",
-            "pkt_pos": "1024828",
+            "pkt_pos": "1024786",
             "pkt_size": "30000",
             "width": 100,
             "height": 100,
@@ -540,7 +540,7 @@
             },
             "tags": {
                 "E": "mc²",
-                "encoder": "Lavc55.63.100 pcm_s16le"
+                "encoder": "pcm_s16le"
             }
         },
         {
@@ -580,7 +580,7 @@
             "tags": {
                 "title": "foobar",
                 "duration_ts": "field-and-tags-conflict-attempt",
-                "encoder": "Lavc55.63.100 rawvideo"
+                "encoder": "rawvideo"
             }
         },
         {
@@ -618,7 +618,7 @@
                 "attached_pic": 0
             },
             "tags": {
-                "encoder": "Lavc55.63.100 rawvideo"
+                "encoder": "rawvideo"
             }
         }
     ],
@@ -629,8 +629,8 @@
         "format_name": "nut",
         "start_time": "0.000000",
         "duration": "0.120000",
-        "size": "1054909",
-        "bit_rate": "70327266",
+        "size": "1054867",
+        "bit_rate": "70324466",
         "probe_score": 100,
         "tags": {
             "title": "ffprobe test file",