1 files changed, 43 insertions, 36 deletions
diff --git a/tests/ref/fate/ffprobe_ini b/tests/ref/fate/ffprobe_ini
index fd01c7c4f3..af38129a4f 100644
--- a/tests/ref/fate/ffprobe_ini
+++ b/tests/ref/fate/ffprobe_ini
@@ -12,7 +12,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=487
+pos=572
 flags=K
 
 [packets_and_frames.frame.0]
@@ -24,7 +24,7 @@ pkt_dts=0
 pkt_dts_time=0.000000
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=487
+pkt_pos=572
 sample_fmt=s16
 nb_samples=1024
 channels=1
@@ -42,7 +42,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=230400
-pos=2562
+pos=2647
 flags=K
 
 [packets_and_frames.frame.1]
@@ -54,7 +54,7 @@ pkt_dts=0
 pkt_dts_time=0.000000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=2562
+pkt_pos=2647
 width=320
 height=240
 pix_fmt=rgb24
@@ -79,7 +79,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=30000
-pos=232983
+pos=233068
 flags=K
 
 [packets_and_frames.frame.2]
@@ -91,7 +91,7 @@ pkt_dts=0
 pkt_dts_time=0.000000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=232983
+pkt_pos=233068
 width=100
 height=100
 pix_fmt=rgb24
@@ -116,7 +116,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=262988
+pos=263073
 flags=K
 
 [packets_and_frames.frame.3]
@@ -128,7 +128,7 @@ pkt_dts=1024
 pkt_dts_time=0.023220
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=262988
+pkt_pos=263073
 sample_fmt=s16
 nb_samples=1024
 channels=1
@@ -146,7 +146,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=230400
-pos=265066
+pos=265151
 flags=K
 
 [packets_and_frames.frame.4]
@@ -158,7 +158,7 @@ pkt_dts=2048
 pkt_dts_time=0.040000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=265066
+pkt_pos=265151
 width=320
 height=240
 pix_fmt=rgb24
@@ -183,7 +183,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=30000
-pos=495490
+pos=495575
 flags=K
 
 [packets_and_frames.frame.5]
@@ -195,7 +195,7 @@ pkt_dts=2048
 pkt_dts_time=0.040000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=495490
+pkt_pos=495575
 width=100
 height=100
 pix_fmt=rgb24
@@ -220,7 +220,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=525495
+pos=525580
 flags=K
 
 [packets_and_frames.frame.6]
@@ -232,7 +232,7 @@ pkt_dts=2048
 pkt_dts_time=0.046440
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=525495
+pkt_pos=525580
 sample_fmt=s16
 nb_samples=1024
 channels=1
@@ -250,7 +250,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=527566
+pos=527651
 flags=K
 
 [packets_and_frames.frame.7]
@@ -262,7 +262,7 @@ pkt_dts=3072
 pkt_dts_time=0.069660
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=527566
+pkt_pos=527651
 sample_fmt=s16
 nb_samples=1024
 channels=1
@@ -280,7 +280,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=230400
-pos=529644
+pos=529729
 flags=K
 
 [packets_and_frames.frame.8]
@@ -292,7 +292,7 @@ pkt_dts=4096
 pkt_dts_time=0.080000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=529644
+pkt_pos=529729
 width=320
 height=240
 pix_fmt=rgb24
@@ -317,7 +317,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=30000
-pos=760068
+pos=760153
 flags=K
 
 [packets_and_frames.frame.9]
@@ -329,7 +329,7 @@ pkt_dts=4096
 pkt_dts_time=0.080000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=760068
+pkt_pos=760153
 width=100
 height=100
 pix_fmt=rgb24
@@ -354,7 +354,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=790073
+pos=790158
 flags=K
 
 [packets_and_frames.frame.10]
@@ -366,7 +366,7 @@ pkt_dts=4096
 pkt_dts_time=0.092880
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=790073
+pkt_pos=790158
 sample_fmt=s16
 nb_samples=1024
 channels=1
@@ -384,7 +384,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=792144
+pos=792229
 flags=K
 
 [packets_and_frames.frame.11]
@@ -396,7 +396,7 @@ pkt_dts=5120
 pkt_dts_time=0.116100
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=792144
+pkt_pos=792229
 sample_fmt=s16
 nb_samples=1024
 channels=1
@@ -414,7 +414,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=230400
-pos=794222
+pos=794307
 flags=K
 
 [packets_and_frames.frame.12]
@@ -426,7 +426,7 @@ pkt_dts=6144
 pkt_dts_time=0.120000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=794222
+pkt_pos=794307
 width=320
 height=240
 pix_fmt=rgb24
@@ -451,7 +451,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=30000
-pos=1024646
+pos=1024731
 flags=K
 
 [packets_and_frames.frame.13]
@@ -463,7 +463,7 @@ pkt_dts=6144
 pkt_dts_time=0.120000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=1024646
+pkt_pos=1024731
 width=100
 height=100
 pix_fmt=rgb24
@@ -494,8 +494,8 @@ avg_frame_rate=0/0
 time_base=1/44100
 start_pts=0
 start_time=0.000000
-duration_ts=527364
-duration=11.958367
+duration_ts=527406
+duration=11.959320
 bit_rate=705600
 nb_frames=N/A
 nb_read_frames=6
@@ -514,6 +514,9 @@ visual_impaired=0
 clean_effects=0
 attached_pic=0
 
+[streams.stream.0.tags]
+E=mc²
+
 [streams.stream.1]
 index=1
 codec_name=rawvideo
@@ -536,8 +539,8 @@ avg_frame_rate=25/1
 time_base=1/51200
 start_pts=0
 start_time=0.000000
-duration_ts=612268
-duration=11.958359
+duration_ts=612317
+duration=11.959316
 bit_rate=N/A
 nb_frames=N/A
 nb_read_frames=4
@@ -556,6 +559,10 @@ visual_impaired=0
 clean_effects=0
 attached_pic=0
 
+[streams.stream.1.tags]
+title=foobar
+duration_ts=field-and-tags-conflict-attempt
+
 [streams.stream.2]
 index=2
 codec_name=rawvideo
@@ -578,8 +585,8 @@ avg_frame_rate=25/1
 time_base=1/51200
 start_pts=0
 start_time=0.000000
-duration_ts=612268
-duration=11.958359
+duration_ts=612317
+duration=11.959316
 bit_rate=N/A
 nb_frames=N/A
 nb_read_frames=4
@@ -603,8 +610,8 @@ filename=tests/data/ffprobe-test.nut
 nb_streams=3
 format_name=nut
 start_time=0.000000
-duration=11.958367
-size=1054727
+duration=11.959320
+size=1054812
 bit_rate=705599
 
 [format.tags]