aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-18 22:00:00 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-18 22:00:00 +0200
commitbbee02ed9c186c1bb1fc0c3bcf79e78af978ae6a (patch)
tree0a212cea8d72ab493df855149ec29631514e859c /tests
parent1e49439f04f4aeb45344e8753094d00ac4b1a5d6 (diff)
downloadffmpeg-bbee02ed9c186c1bb1fc0c3bcf79e78af978ae6a.tar.gz
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>
Diffstat (limited to 'tests')
-rw-r--r--tests/ref/fate/ffprobe_compact64
-rw-r--r--tests/ref/fate/ffprobe_csv64
-rw-r--r--tests/ref/fate/ffprobe_default66
-rw-r--r--tests/ref/fate/ffprobe_flat66
-rw-r--r--tests/ref/fate/ffprobe_ini66
-rw-r--r--tests/ref/fate/ffprobe_json66
-rw-r--r--tests/ref/fate/ffprobe_xml64
7 files changed, 228 insertions, 228 deletions
diff --git a/tests/ref/fate/ffprobe_compact b/tests/ref/fate/ffprobe_compact
index e25648adc4..5786f3f3b5 100644
--- a/tests/ref/fate/ffprobe_compact
+++ b/tests/ref/fate/ffprobe_compact
@@ -1,32 +1,32 @@
-packet|codec_type=audio|stream_index=0|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=669|flags=K
-frame|media_type=audio|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|best_effort_timestamp=0|best_effort_timestamp_time=0.000000|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=669|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
-packet|codec_type=video|stream_index=1|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=2744|flags=K
-frame|media_type=video|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|best_effort_timestamp=0|best_effort_timestamp_time=0.000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=2744|pkt_size=230400|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0
-packet|codec_type=video|stream_index=2|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=233165|flags=K
-frame|media_type=video|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|best_effort_timestamp=0|best_effort_timestamp_time=0.000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=233165|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0
-packet|codec_type=audio|stream_index=0|pts=1024|pts_time=0.023220|dts=1024|dts_time=0.023220|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=263170|flags=K
-frame|media_type=audio|key_frame=1|pkt_pts=1024|pkt_pts_time=0.023220|pkt_dts=1024|pkt_dts_time=0.023220|best_effort_timestamp=1024|best_effort_timestamp_time=0.023220|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=263170|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
-packet|codec_type=video|stream_index=1|pts=2048|pts_time=0.040000|dts=2048|dts_time=0.040000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=265248|flags=K
-frame|media_type=video|key_frame=1|pkt_pts=2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0.040000|best_effort_timestamp=2048|best_effort_timestamp_time=0.040000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=265248|pkt_size=230400|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0
-packet|codec_type=video|stream_index=2|pts=2048|pts_time=0.040000|dts=2048|dts_time=0.040000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=495672|flags=K
-frame|media_type=video|key_frame=1|pkt_pts=2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0.040000|best_effort_timestamp=2048|best_effort_timestamp_time=0.040000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=495672|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0
-packet|codec_type=audio|stream_index=0|pts=2048|pts_time=0.046440|dts=2048|dts_time=0.046440|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=525677|flags=K
-frame|media_type=audio|key_frame=1|pkt_pts=2048|pkt_pts_time=0.046440|pkt_dts=2048|pkt_dts_time=0.046440|best_effort_timestamp=2048|best_effort_timestamp_time=0.046440|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=525677|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
-packet|codec_type=audio|stream_index=0|pts=3072|pts_time=0.069660|dts=3072|dts_time=0.069660|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=527748|flags=K
-frame|media_type=audio|key_frame=1|pkt_pts=3072|pkt_pts_time=0.069660|pkt_dts=3072|pkt_dts_time=0.069660|best_effort_timestamp=3072|best_effort_timestamp_time=0.069660|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=527748|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
-packet|codec_type=video|stream_index=1|pts=4096|pts_time=0.080000|dts=4096|dts_time=0.080000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=529826|flags=K
-frame|media_type=video|key_frame=1|pkt_pts=4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0.080000|best_effort_timestamp=4096|best_effort_timestamp_time=0.080000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=529826|pkt_size=230400|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0
-packet|codec_type=video|stream_index=2|pts=4096|pts_time=0.080000|dts=4096|dts_time=0.080000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=760250|flags=K
-frame|media_type=video|key_frame=1|pkt_pts=4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0.080000|best_effort_timestamp=4096|best_effort_timestamp_time=0.080000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=760250|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0
-packet|codec_type=audio|stream_index=0|pts=4096|pts_time=0.092880|dts=4096|dts_time=0.092880|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=790255|flags=K
-frame|media_type=audio|key_frame=1|pkt_pts=4096|pkt_pts_time=0.092880|pkt_dts=4096|pkt_dts_time=0.092880|best_effort_timestamp=4096|best_effort_timestamp_time=0.092880|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=790255|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
-packet|codec_type=audio|stream_index=0|pts=5120|pts_time=0.116100|dts=5120|dts_time=0.116100|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=792326|flags=K
-frame|media_type=audio|key_frame=1|pkt_pts=5120|pkt_pts_time=0.116100|pkt_dts=5120|pkt_dts_time=0.116100|best_effort_timestamp=5120|best_effort_timestamp_time=0.116100|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=792326|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
-packet|codec_type=video|stream_index=1|pts=6144|pts_time=0.120000|dts=6144|dts_time=0.120000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=794404|flags=K
-frame|media_type=video|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|best_effort_timestamp=6144|best_effort_timestamp_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=794404|pkt_size=230400|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0
-packet|codec_type=video|stream_index=2|pts=6144|pts_time=0.120000|dts=6144|dts_time=0.120000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=1024828|flags=K
-frame|media_type=video|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|best_effort_timestamp=6144|best_effort_timestamp_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=1024828|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0
-stream|index=0|codec_name=pcm_s16le|profile=unknown|codec_type=audio|codec_time_base=1/44100|codec_tag_string=PSD[16]|codec_tag=0x10445350|sample_fmt=s16|sample_rate=44100|channels=1|channel_layout=unknown|bits_per_sample=16|id=N/A|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/44100|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=705600|nb_frames=N/A|nb_read_frames=6|nb_read_packets=6|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|tag:E=mc²|tag:encoder=Lavc55.63.100 pcm_s16le
-stream|index=1|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/51200|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=320|height=240|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=4:3|pix_fmt=rgb24|level=-99|timecode=N/A|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|tag:title=foobar|tag:duration_ts=field-and-tags-conflict-attempt|tag:encoder=Lavc55.63.100 rawvideo
-stream|index=2|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/51200|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=100|height=100|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=1:1|pix_fmt=rgb24|level=-99|timecode=N/A|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|tag:encoder=Lavc55.63.100 rawvideo
-format|filename=tests/data/ffprobe-test.nut|nb_streams=3|nb_programs=0|format_name=nut|start_time=0.000000|duration=0.120000|size=1054909|bit_rate=70327266|probe_score=100|tag:title=ffprobe test file|tag:comment='A comment with CSV, XML & JSON special chars': <tag value="x">|tag:comment2=I ♥ Üñîçød€
+packet|codec_type=audio|stream_index=0|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=627|flags=K
+frame|media_type=audio|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|best_effort_timestamp=0|best_effort_timestamp_time=0.000000|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=627|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
+packet|codec_type=video|stream_index=1|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=2702|flags=K
+frame|media_type=video|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|best_effort_timestamp=0|best_effort_timestamp_time=0.000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=2702|pkt_size=230400|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0
+packet|codec_type=video|stream_index=2|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=233123|flags=K
+frame|media_type=video|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|best_effort_timestamp=0|best_effort_timestamp_time=0.000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=233123|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0
+packet|codec_type=audio|stream_index=0|pts=1024|pts_time=0.023220|dts=1024|dts_time=0.023220|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=263128|flags=K
+frame|media_type=audio|key_frame=1|pkt_pts=1024|pkt_pts_time=0.023220|pkt_dts=1024|pkt_dts_time=0.023220|best_effort_timestamp=1024|best_effort_timestamp_time=0.023220|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=263128|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
+packet|codec_type=video|stream_index=1|pts=2048|pts_time=0.040000|dts=2048|dts_time=0.040000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=265206|flags=K
+frame|media_type=video|key_frame=1|pkt_pts=2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0.040000|best_effort_timestamp=2048|best_effort_timestamp_time=0.040000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=265206|pkt_size=230400|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0
+packet|codec_type=video|stream_index=2|pts=2048|pts_time=0.040000|dts=2048|dts_time=0.040000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=495630|flags=K
+frame|media_type=video|key_frame=1|pkt_pts=2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0.040000|best_effort_timestamp=2048|best_effort_timestamp_time=0.040000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=495630|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0
+packet|codec_type=audio|stream_index=0|pts=2048|pts_time=0.046440|dts=2048|dts_time=0.046440|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=525635|flags=K
+frame|media_type=audio|key_frame=1|pkt_pts=2048|pkt_pts_time=0.046440|pkt_dts=2048|pkt_dts_time=0.046440|best_effort_timestamp=2048|best_effort_timestamp_time=0.046440|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=525635|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
+packet|codec_type=audio|stream_index=0|pts=3072|pts_time=0.069660|dts=3072|dts_time=0.069660|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=527706|flags=K
+frame|media_type=audio|key_frame=1|pkt_pts=3072|pkt_pts_time=0.069660|pkt_dts=3072|pkt_dts_time=0.069660|best_effort_timestamp=3072|best_effort_timestamp_time=0.069660|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=527706|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
+packet|codec_type=video|stream_index=1|pts=4096|pts_time=0.080000|dts=4096|dts_time=0.080000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=529784|flags=K
+frame|media_type=video|key_frame=1|pkt_pts=4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0.080000|best_effort_timestamp=4096|best_effort_timestamp_time=0.080000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=529784|pkt_size=230400|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0
+packet|codec_type=video|stream_index=2|pts=4096|pts_time=0.080000|dts=4096|dts_time=0.080000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=760208|flags=K
+frame|media_type=video|key_frame=1|pkt_pts=4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0.080000|best_effort_timestamp=4096|best_effort_timestamp_time=0.080000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=760208|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0
+packet|codec_type=audio|stream_index=0|pts=4096|pts_time=0.092880|dts=4096|dts_time=0.092880|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=790213|flags=K
+frame|media_type=audio|key_frame=1|pkt_pts=4096|pkt_pts_time=0.092880|pkt_dts=4096|pkt_dts_time=0.092880|best_effort_timestamp=4096|best_effort_timestamp_time=0.092880|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=790213|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
+packet|codec_type=audio|stream_index=0|pts=5120|pts_time=0.116100|dts=5120|dts_time=0.116100|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=792284|flags=K
+frame|media_type=audio|key_frame=1|pkt_pts=5120|pkt_pts_time=0.116100|pkt_dts=5120|pkt_dts_time=0.116100|best_effort_timestamp=5120|best_effort_timestamp_time=0.116100|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=792284|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
+packet|codec_type=video|stream_index=1|pts=6144|pts_time=0.120000|dts=6144|dts_time=0.120000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=794362|flags=K
+frame|media_type=video|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|best_effort_timestamp=6144|best_effort_timestamp_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=794362|pkt_size=230400|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0
+packet|codec_type=video|stream_index=2|pts=6144|pts_time=0.120000|dts=6144|dts_time=0.120000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=1024786|flags=K
+frame|media_type=video|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|best_effort_timestamp=6144|best_effort_timestamp_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=1024786|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0
+stream|index=0|codec_name=pcm_s16le|profile=unknown|codec_type=audio|codec_time_base=1/44100|codec_tag_string=PSD[16]|codec_tag=0x10445350|sample_fmt=s16|sample_rate=44100|channels=1|channel_layout=unknown|bits_per_sample=16|id=N/A|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/44100|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=705600|nb_frames=N/A|nb_read_frames=6|nb_read_packets=6|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|tag:E=mc²|tag:encoder=pcm_s16le
+stream|index=1|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/51200|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=320|height=240|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=4:3|pix_fmt=rgb24|level=-99|timecode=N/A|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|tag:title=foobar|tag:duration_ts=field-and-tags-conflict-attempt|tag:encoder=rawvideo
+stream|index=2|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/51200|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=100|height=100|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=1:1|pix_fmt=rgb24|level=-99|timecode=N/A|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|tag:encoder=rawvideo
+format|filename=tests/data/ffprobe-test.nut|nb_streams=3|nb_programs=0|format_name=nut|start_time=0.000000|duration=0.120000|size=1054867|bit_rate=70324466|probe_score=100|tag:title=ffprobe test file|tag:comment='A comment with CSV, XML & JSON special chars': <tag value="x">|tag:comment2=I ♥ Üñîçød€
diff --git a/tests/ref/fate/ffprobe_csv b/tests/ref/fate/ffprobe_csv
index 007b4e7f86..41f8f99efe 100644
--- a/tests/ref/fate/ffprobe_csv
+++ b/tests/ref/fate/ffprobe_csv
@@ -1,32 +1,32 @@
-packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,669,K
-frame,audio,1,0,0.000000,0,0.000000,0,0.000000,1024,0.023220,669,2048,s16,1024,1,unknown
-packet,video,1,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,230400,2744,K
-frame,video,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,2744,230400,320,240,rgb24,1:1,I,0,0,0,0,0
-packet,video,2,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,30000,233165,K
-frame,video,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,233165,30000,100,100,rgb24,1:1,I,0,0,0,0,0
-packet,audio,0,1024,0.023220,1024,0.023220,1024,0.023220,N/A,N/A,2048,263170,K
-frame,audio,1,1024,0.023220,1024,0.023220,1024,0.023220,1024,0.023220,263170,2048,s16,1024,1,unknown
-packet,video,1,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,230400,265248,K
-frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,265248,230400,320,240,rgb24,1:1,I,0,0,0,0,0
-packet,video,2,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,30000,495672,K
-frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,495672,30000,100,100,rgb24,1:1,I,0,0,0,0,0
-packet,audio,0,2048,0.046440,2048,0.046440,1024,0.023220,N/A,N/A,2048,525677,K
-frame,audio,1,2048,0.046440,2048,0.046440,2048,0.046440,1024,0.023220,525677,2048,s16,1024,1,unknown
-packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/A,N/A,2048,527748,K
-frame,audio,1,3072,0.069660,3072,0.069660,3072,0.069660,1024,0.023220,527748,2048,s16,1024,1,unknown
-packet,video,1,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,230400,529826,K
-frame,video,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,529826,230400,320,240,rgb24,1:1,I,0,0,0,0,0
-packet,video,2,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,30000,760250,K
-frame,video,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,760250,30000,100,100,rgb24,1:1,I,0,0,0,0,0
-packet,audio,0,4096,0.092880,4096,0.092880,1024,0.023220,N/A,N/A,2048,790255,K
-frame,audio,1,4096,0.092880,4096,0.092880,4096,0.092880,1024,0.023220,790255,2048,s16,1024,1,unknown
-packet,audio,0,5120,0.116100,5120,0.116100,1024,0.023220,N/A,N/A,2048,792326,K
-frame,audio,1,5120,0.116100,5120,0.116100,5120,0.116100,1024,0.023220,792326,2048,s16,1024,1,unknown
-packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,230400,794404,K
-frame,video,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,794404,230400,320,240,rgb24,1:1,I,0,0,0,0,0
-packet,video,2,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,30000,1024828,K
-frame,video,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,1024828,30000,100,100,rgb24,1:1,I,0,0,0,0,0
-stream,0,pcm_s16le,unknown,audio,1/44100,PSD[16],0x10445350,s16,44100,1,unknown,16,N/A,0/0,0/0,1/44100,0,0.000000,N/A,N/A,705600,N/A,6,6,0,0,0,0,0,0,0,0,0,0,0,mc²,Lavc55.63.100 pcm_s16le
-stream,1,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,320,240,0,1:1,4:3,rgb24,-99,N/A,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,foobar,field-and-tags-conflict-attempt,Lavc55.63.100 rawvideo
-stream,2,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,100,100,0,1:1,1:1,rgb24,-99,N/A,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,Lavc55.63.100 rawvideo
-format,tests/data/ffprobe-test.nut,3,0,nut,0.000000,0.120000,1054909,70327266,100,ffprobe test file,"'A comment with CSV, XML & JSON special chars': <tag value=""x"">",I ♥ Üñîçød€
+packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,627,K
+frame,audio,1,0,0.000000,0,0.000000,0,0.000000,1024,0.023220,627,2048,s16,1024,1,unknown
+packet,video,1,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,230400,2702,K
+frame,video,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,2702,230400,320,240,rgb24,1:1,I,0,0,0,0,0
+packet,video,2,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,30000,233123,K
+frame,video,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,233123,30000,100,100,rgb24,1:1,I,0,0,0,0,0
+packet,audio,0,1024,0.023220,1024,0.023220,1024,0.023220,N/A,N/A,2048,263128,K
+frame,audio,1,1024,0.023220,1024,0.023220,1024,0.023220,1024,0.023220,263128,2048,s16,1024,1,unknown
+packet,video,1,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,230400,265206,K
+frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,265206,230400,320,240,rgb24,1:1,I,0,0,0,0,0
+packet,video,2,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,30000,495630,K
+frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,495630,30000,100,100,rgb24,1:1,I,0,0,0,0,0
+packet,audio,0,2048,0.046440,2048,0.046440,1024,0.023220,N/A,N/A,2048,525635,K
+frame,audio,1,2048,0.046440,2048,0.046440,2048,0.046440,1024,0.023220,525635,2048,s16,1024,1,unknown
+packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/A,N/A,2048,527706,K
+frame,audio,1,3072,0.069660,3072,0.069660,3072,0.069660,1024,0.023220,527706,2048,s16,1024,1,unknown
+packet,video,1,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,230400,529784,K
+frame,video,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,529784,230400,320,240,rgb24,1:1,I,0,0,0,0,0
+packet,video,2,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,30000,760208,K
+frame,video,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,760208,30000,100,100,rgb24,1:1,I,0,0,0,0,0
+packet,audio,0,4096,0.092880,4096,0.092880,1024,0.023220,N/A,N/A,2048,790213,K
+frame,audio,1,4096,0.092880,4096,0.092880,4096,0.092880,1024,0.023220,790213,2048,s16,1024,1,unknown
+packet,audio,0,5120,0.116100,5120,0.116100,1024,0.023220,N/A,N/A,2048,792284,K
+frame,audio,1,5120,0.116100,5120,0.116100,5120,0.116100,1024,0.023220,792284,2048,s16,1024,1,unknown
+packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,230400,794362,K
+frame,video,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,794362,230400,320,240,rgb24,1:1,I,0,0,0,0,0
+packet,video,2,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,30000,1024786,K
+frame,video,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,1024786,30000,100,100,rgb24,1:1,I,0,0,0,0,0
+stream,0,pcm_s16le,unknown,audio,1/44100,PSD[16],0x10445350,s16,44100,1,unknown,16,N/A,0/0,0/0,1/44100,0,0.000000,N/A,N/A,705600,N/A,6,6,0,0,0,0,0,0,0,0,0,0,0,mc²,pcm_s16le
+stream,1,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,320,240,0,1:1,4:3,rgb24,-99,N/A,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,foobar,field-and-tags-conflict-attempt,rawvideo
+stream,2,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,100,100,0,1:1,1:1,rgb24,-99,N/A,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,rawvideo
+format,tests/data/ffprobe-test.nut,3,0,nut,0.000000,0.120000,1054867,70324466,100,ffprobe test file,"'A comment with CSV, XML & JSON special chars': <tag value=""x"">",I ♥ Üñîçød€
diff --git a/tests/ref/fate/ffprobe_default b/tests/ref/fate/ffprobe_default
index ac1d200135..d47a108571 100644
--- a/tests/ref/fate/ffprobe_default
+++ b/tests/ref/fate/ffprobe_default
@@ -10,7 +10,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
-pos=669
+pos=627
flags=K
[/PACKET]
[FRAME]
@@ -24,7 +24,7 @@ best_effort_timestamp=0
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_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=230400
-pos=2744
+pos=2702
flags=K
[/PACKET]
[FRAME]
@@ -57,7 +57,7 @@ best_effort_timestamp=0
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_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=30000
-pos=233165
+pos=233123
flags=K
[/PACKET]
[FRAME]
@@ -96,7 +96,7 @@ best_effort_timestamp=0
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_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
-pos=263170
+pos=263128
flags=K
[/PACKET]
[FRAME]
@@ -135,7 +135,7 @@ best_effort_timestamp=1024
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
@@ -154,7 +154,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=230400
-pos=265248
+pos=265206
flags=K
[/PACKET]
[FRAME]
@@ -168,7 +168,7 @@ best_effort_timestamp=2048
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
@@ -193,7 +193,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=30000
-pos=495672
+pos=495630
flags=K
[/PACKET]
[FRAME]
@@ -207,7 +207,7 @@ best_effort_timestamp=2048
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
@@ -232,7 +232,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
-pos=525677
+pos=525635
flags=K
[/PACKET]
[FRAME]
@@ -246,7 +246,7 @@ best_effort_timestamp=2048
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
@@ -265,7 +265,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
-pos=527748
+pos=527706
flags=K
[/PACKET]
[FRAME]
@@ -279,7 +279,7 @@ best_effort_timestamp=3072
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
@@ -298,7 +298,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=230400
-pos=529826
+pos=529784
flags=K
[/PACKET]
[FRAME]
@@ -312,7 +312,7 @@ best_effort_timestamp=4096
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
@@ -337,7 +337,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=30000
-pos=760250
+pos=760208
flags=K
[/PACKET]
[FRAME]
@@ -351,7 +351,7 @@ best_effort_timestamp=4096
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
@@ -376,7 +376,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
-pos=790255
+pos=790213
flags=K
[/PACKET]
[FRAME]
@@ -390,7 +390,7 @@ best_effort_timestamp=4096
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
@@ -409,7 +409,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
-pos=792326
+pos=792284
flags=K
[/PACKET]
[FRAME]
@@ -423,7 +423,7 @@ best_effort_timestamp=5120
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
@@ -442,7 +442,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=230400
-pos=794404
+pos=794362
flags=K
[/PACKET]
[FRAME]
@@ -456,7 +456,7 @@ best_effort_timestamp=6144
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
@@ -481,7 +481,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=30000
-pos=1024828
+pos=1024786
flags=K
[/PACKET]
[FRAME]
@@ -495,7 +495,7 @@ best_effort_timestamp=6144
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
@@ -545,7 +545,7 @@ DISPOSITION:visual_impaired=0
DISPOSITION:clean_effects=0
DISPOSITION:attached_pic=0
TAG:E=mc²
-TAG:encoder=Lavc55.63.100 pcm_s16le
+TAG:encoder=pcm_s16le
[/STREAM]
[STREAM]
index=1
@@ -588,7 +588,7 @@ DISPOSITION:clean_effects=0
DISPOSITION:attached_pic=0
TAG:title=foobar
TAG:duration_ts=field-and-tags-conflict-attempt
-TAG:encoder=Lavc55.63.100 rawvideo
+TAG:encoder=rawvideo
[/STREAM]
[STREAM]
index=2
@@ -629,7 +629,7 @@ DISPOSITION:hearing_impaired=0
DISPOSITION:visual_impaired=0
DISPOSITION:clean_effects=0
DISPOSITION:attached_pic=0
-TAG:encoder=Lavc55.63.100 rawvideo
+TAG:encoder=rawvideo
[/STREAM]
[FORMAT]
filename=tests/data/ffprobe-test.nut
@@ -638,8 +638,8 @@ nb_programs=0
format_name=nut
start_time=0.000000
duration=0.120000
-size=1054909
-bit_rate=70327266
+size=1054867
+bit_rate=70324466
probe_score=100
TAG:title=ffprobe test file
TAG:comment='A comment with CSV, XML & JSON special chars': <tag value="x">
diff --git a/tests/ref/fate/ffprobe_flat b/tests/ref/fate/ffprobe_flat
index e0b19ad0e7..2a2d4b330b 100644
--- a/tests/ref/fate/ffprobe_flat
+++ b/tests/ref/fate/ffprobe_flat
@@ -9,7 +9,7 @@ packets_and_frames.packet.0.duration_time="0.023220"
packets_and_frames.packet.0.convergence_duration="N/A"
packets_and_frames.packet.0.convergence_duration_time="N/A"
packets_and_frames.packet.0.size="2048"
-packets_and_frames.packet.0.pos="669"
+packets_and_frames.packet.0.pos="627"
packets_and_frames.packet.0.flags="K"
packets_and_frames.frame.0.media_type="audio"
packets_and_frames.frame.0.key_frame=1
@@ -21,7 +21,7 @@ packets_and_frames.frame.0.best_effort_timestamp=0
packets_and_frames.frame.0.best_effort_timestamp_time="0.000000"
packets_and_frames.frame.0.pkt_duration=1024
packets_and_frames.frame.0.pkt_duration_time="0.023220"
-packets_and_frames.frame.0.pkt_pos="669"
+packets_and_frames.frame.0.pkt_pos="627"
packets_and_frames.frame.0.pkt_size="2048"
packets_and_frames.frame.0.sample_fmt="s16"
packets_and_frames.frame.0.nb_samples=1024
@@ -38,7 +38,7 @@ packets_and_frames.packet.1.duration_time="0.040000"
packets_and_frames.packet.1.convergence_duration="N/A"
packets_and_frames.packet.1.convergence_duration_time="N/A"
packets_and_frames.packet.1.size="230400"
-packets_and_frames.packet.1.pos="2744"
+packets_and_frames.packet.1.pos="2702"
packets_and_frames.packet.1.flags="K"
packets_and_frames.frame.1.media_type="video"
packets_and_frames.frame.1.key_frame=1
@@ -50,7 +50,7 @@ packets_and_frames.frame.1.best_effort_timestamp=0
packets_and_frames.frame.1.best_effort_timestamp_time="0.000000"
packets_and_frames.frame.1.pkt_duration=2048
packets_and_frames.frame.1.pkt_duration_time="0.040000"
-packets_and_frames.frame.1.pkt_pos="2744"
+packets_and_frames.frame.1.pkt_pos="2702"
packets_and_frames.frame.1.pkt_size="230400"
packets_and_frames.frame.1.width=320
packets_and_frames.frame.1.height=240
@@ -73,7 +73,7 @@ packets_and_frames.packet.2.duration_time="0.040000"
packets_and_frames.packet.2.convergence_duration="N/A"
packets_and_frames.packet.2.convergence_duration_time="N/A"
packets_and_frames.packet.2.size="30000"
-packets_and_frames.packet.2.pos="233165"
+packets_and_frames.packet.2.pos="233123"
packets_and_frames.packet.2.flags="K"
packets_and_frames.frame.2.media_type="video"
packets_and_frames.frame.2.key_frame=1
@@ -85,7 +85,7 @@ packets_and_frames.frame.2.best_effort_timestamp=0
packets_and_frames.frame.2.best_effort_timestamp_time="0.000000"
packets_and_frames.frame.2.pkt_duration=2048
packets_and_frames.frame.2.pkt_duration_time="0.040000"
-packets_and_frames.frame.2.pkt_pos="233165"
+packets_and_frames.frame.2.pkt_pos="233123"
packets_and_frames.frame.2.pkt_size="30000"
packets_and_frames.frame.2.width=100
packets_and_frames.frame.2.height=100
@@ -108,7 +108,7 @@ packets_and_frames.packet.3.duration_time="0.023220"
packets_and_frames.packet.3.convergence_duration="N/A"
packets_and_frames.packet.3.convergence_duration_time="N/A"
packets_and_frames.packet.3.size="2048"
-packets_and_frames.packet.3.pos="263170"
+packets_and_frames.packet.3.pos="263128"
packets_and_frames.packet.3.flags="K"
packets_and_frames.frame.3.media_type="audio"
packets_and_frames.frame.3.key_frame=1
@@ -120,7 +120,7 @@ packets_and_frames.frame.3.best_effort_timestamp=1024
packets_and_frames.frame.3.best_effort_timestamp_time="0.023220"
packets_and_frames.frame.3.pkt_duration=1024
packets_and_frames.frame.3.pkt_duration_time="0.023220"
-packets_and_frames.frame.3.pkt_pos="263170"
+packets_and_frames.frame.3.pkt_pos="263128"
packets_and_frames.frame.3.pkt_size="2048"
packets_and_frames.frame.3.sample_fmt="s16"
packets_and_frames.frame.3.nb_samples=1024
@@ -137,7 +137,7 @@ packets_and_frames.packet.4.duration_time="0.040000"
packets_and_frames.packet.4.convergence_duration="N/A"
packets_and_frames.packet.4.convergence_duration_time="N/A"
packets_and_frames.packet.4.size="230400"
-packets_and_frames.packet.4.pos="265248"
+packets_and_frames.packet.4.pos="265206"
packets_and_frames.packet.4.flags="K"
packets_and_frames.frame.4.media_type="video"
packets_and_frames.frame.4.key_frame=1
@@ -149,7 +149,7 @@ packets_and_frames.frame.4.best_effort_timestamp=2048
packets_and_frames.frame.4.best_effort_timestamp_time="0.040000"
packets_and_frames.frame.4.pkt_duration=2048
packets_and_frames.frame.4.pkt_duration_time="0.040000"
-packets_and_frames.frame.4.pkt_pos="265248"
+packets_and_frames.frame.4.pkt_pos="265206"
packets_and_frames.frame.4.pkt_size="230400"
packets_and_frames.frame.4.width=320
packets_and_frames.frame.4.height=240
@@ -172,7 +172,7 @@ packets_and_frames.packet.5.duration_time="0.040000"
packets_and_frames.packet.5.convergence_duration="N/A"
packets_and_frames.packet.5.convergence_duration_time="N/A"
packets_and_frames.packet.5.size="30000"
-packets_and_frames.packet.5.pos="495672"
+packets_and_frames.packet.5.pos="495630"
packets_and_frames.packet.5.flags="K"
packets_and_frames.frame.5.media_type="video"
packets_and_frames.frame.5.key_frame=1
@@ -184,7 +184,7 @@ packets_and_frames.frame.5.best_effort_timestamp=2048
packets_and_frames.frame.5.best_effort_timestamp_time="0.040000"
packets_and_frames.frame.5.pkt_duration=2048
packets_and_frames.frame.5.pkt_duration_time="0.040000"
-packets_and_frames.frame.5.pkt_pos="495672"
+packets_and_frames.frame.5.pkt_pos="495630"
packets_and_frames.frame.5.pkt_size="30000"
packets_and_frames.frame.5.width=100
packets_and_frames.frame.5.height=100
@@ -207,7 +207,7 @@ packets_and_frames.packet.6.duration_time="0.023220"
packets_and_frames.packet.6.convergence_duration="N/A"
packets_and_frames.packet.6.convergence_duration_time="N/A"
packets_and_frames.packet.6.size="2048"
-packets_and_frames.packet.6.pos="525677"
+packets_and_frames.packet.6.pos="525635"
packets_and_frames.packet.6.flags="K"
packets_and_frames.frame.6.media_type="audio"
packets_and_frames.frame.6.key_frame=1
@@ -219,7 +219,7 @@ packets_and_frames.frame.6.best_effort_timestamp=2048
packets_and_frames.frame.6.best_effort_timestamp_time="0.046440"
packets_and_frames.frame.6.pkt_duration=1024
packets_and_frames.frame.6.pkt_duration_time="0.023220"
-packets_and_frames.frame.6.pkt_pos="525677"
+packets_and_frames.frame.6.pkt_pos="525635"
packets_and_frames.frame.6.pkt_size="2048"
packets_and_frames.frame.6.sample_fmt="s16"
packets_and_frames.frame.6.nb_samples=1024
@@ -236,7 +236,7 @@ packets_and_frames.packet.7.duration_time="0.023220"
packets_and_frames.packet.7.convergence_duration="N/A"
packets_and_frames.packet.7.convergence_duration_time="N/A"
packets_and_frames.packet.7.size="2048"
-packets_and_frames.packet.7.pos="527748"
+packets_and_frames.packet.7.pos="527706"
packets_and_frames.packet.7.flags="K"
packets_and_frames.frame.7.media_type="audio"
packets_and_frames.frame.7.key_frame=1
@@ -248,7 +248,7 @@ packets_and_frames.frame.7.best_effort_timestamp=3072
packets_and_frames.frame.7.best_effort_timestamp_time="0.069660"
packets_and_frames.frame.7.pkt_duration=1024
packets_and_frames.frame.7.pkt_duration_time="0.023220"
-packets_and_frames.frame.7.pkt_pos="527748"
+packets_and_frames.frame.7.pkt_pos="527706"
packets_and_frames.frame.7.pkt_size="2048"
packets_and_frames.frame.7.sample_fmt="s16"
packets_and_frames.frame.7.nb_samples=1024
@@ -265,7 +265,7 @@ packets_and_frames.packet.8.duration_time="0.040000"
packets_and_frames.packet.8.convergence_duration="N/A"
packets_and_frames.packet.8.convergence_duration_time="N/A"
packets_and_frames.packet.8.size="230400"
-packets_and_frames.packet.8.pos="529826"
+packets_and_frames.packet.8.pos="529784"
packets_and_frames.packet.8.flags="K"
packets_and_frames.frame.8.media_type="video"
packets_and_frames.frame.8.key_frame=1
@@ -277,7 +277,7 @@ packets_and_frames.frame.8.best_effort_timestamp=4096
packets_and_frames.frame.8.best_effort_timestamp_time="0.080000"
packets_and_frames.frame.8.pkt_duration=2048
packets_and_frames.frame.8.pkt_duration_time="0.040000"
-packets_and_frames.frame.8.pkt_pos="529826"
+packets_and_frames.frame.8.pkt_pos="529784"
packets_and_frames.frame.8.pkt_size="230400"
packets_and_frames.frame.8.width=320
packets_and_frames.frame.8.height=240
@@ -300,7 +300,7 @@ packets_and_frames.packet.9.duration_time="0.040000"
packets_and_frames.packet.9.convergence_duration="N/A"
packets_and_frames.packet.9.convergence_duration_time="N/A"
packets_and_frames.packet.9.size="30000"
-packets_and_frames.packet.9.pos="760250"
+packets_and_frames.packet.9.pos="760208"
packets_and_frames.packet.9.flags="K"
packets_and_frames.frame.9.media_type="video"
packets_and_frames.frame.9.key_frame=1
@@ -312,7 +312,7 @@ packets_and_frames.frame.9.best_effort_timestamp=4096
packets_and_frames.frame.9.best_effort_timestamp_time="0.080000"
packets_and_frames.frame.9.pkt_duration=2048
packets_and_frames.frame.9.pkt_duration_time="0.040000"
-packets_and_frames.frame.9.pkt_pos="760250"
+packets_and_frames.frame.9.pkt_pos="760208"
packets_and_frames.frame.9.pkt_size="30000"
packets_and_frames.frame.9.width=100
packets_and_frames.frame.9.height=100
@@ -335,7 +335,7 @@ packets_and_frames.packet.10.duration_time="0.023220"
packets_and_frames.packet.10.convergence_duration="N/A"
packets_and_frames.packet.10.convergence_duration_time="N/A"
packets_and_frames.packet.10.size="2048"
-packets_and_frames.packet.10.pos="790255"
+packets_and_frames.packet.10.pos="790213"
packets_and_frames.packet.10.flags="K"
packets_and_frames.frame.10.media_type="audio"
packets_and_frames.frame.10.key_frame=1
@@ -347,7 +347,7 @@ packets_and_frames.frame.10.best_effort_timestamp=4096
packets_and_frames.frame.10.best_effort_timestamp_time="0.092880"
packets_and_frames.frame.10.pkt_duration=1024
packets_and_frames.frame.10.pkt_duration_time="0.023220"
-packets_and_frames.frame.10.pkt_pos="790255"
+packets_and_frames.frame.10.pkt_pos="790213"
packets_and_frames.frame.10.pkt_size="2048"
packets_and_frames.frame.10.sample_fmt="s16"
packets_and_frames.frame.10.nb_samples=1024
@@ -364,7 +364,7 @@ packets_and_frames.packet.11.duration_time="0.023220"
packets_and_frames.packet.11.convergence_duration="N/A"
packets_and_frames.packet.11.convergence_duration_time="N/A"
packets_and_frames.packet.11.size="2048"
-packets_and_frames.packet.11.pos="792326"
+packets_and_frames.packet.11.pos="792284"
packets_and_frames.packet.11.flags="K"
packets_and_frames.frame.11.media_type="audio"
packets_and_frames.frame.11.key_frame=1
@@ -376,7 +376,7 @@ packets_and_frames.frame.11.best_effort_timestamp=5120
packets_and_frames.frame.11.best_effort_timestamp_time="0.116100"
packets_and_frames.frame.11.pkt_duration=1024
packets_and_frames.frame.11.pkt_duration_time="0.023220"
-packets_and_frames.frame.11.pkt_pos="792326"
+packets_and_frames.frame.11.pkt_pos="792284"
packets_and_frames.frame.11.pkt_size="2048"
packets_and_frames.frame.11.sample_fmt="s16"
packets_and_frames.frame.11.nb_samples=1024
@@ -393,7 +393,7 @@ packets_and_frames.packet.12.duration_time="0.040000"
packets_and_frames.packet.12.convergence_duration="N/A"
packets_and_frames.packet.12.convergence_duration_time="N/A"
packets_and_frames.packet.12.size="230400"
-packets_and_frames.packet.12.pos="794404"
+packets_and_frames.packet.12.pos="794362"
packets_and_frames.packet.12.flags="K"
packets_and_frames.frame.12.media_type="video"
packets_and_frames.frame.12.key_frame=1
@@ -405,7 +405,7 @@ packets_and_frames.frame.12.best_effort_timestamp=6144
packets_and_frames.frame.12.best_effort_timestamp_time="0.120000"
packets_and_frames.frame.12.pkt_duration=2048
packets_and_frames.frame.12.pkt_duration_time="0.040000"
-packets_and_frames.frame.12.pkt_pos="794404"
+packets_and_frames.frame.12.pkt_pos="794362"
packets_and_frames.frame.12.pkt_size="230400"
packets_and_frames.frame.12.width=320
packets_and_frames.frame.12.height=240
@@ -428,7 +428,7 @@ packets_and_frames.packet.13.duration_time="0.040000"
packets_and_frames.packet.13.convergence_duration="N/A"
packets_and_frames.packet.13.convergence_duration_time="N/A"
packets_and_frames.packet.13.size="30000"
-packets_and_frames.packet.13.pos="1024828"
+packets_and_frames.packet.13.pos="1024786"
packets_and_frames.packet.13.flags="K"
packets_and_frames.frame.13.media_type="video"
packets_and_frames.frame.13.key_frame=1
@@ -440,7 +440,7 @@ packets_and_frames.frame.13.best_effort_timestamp=6144
packets_and_frames.frame.13.best_effort_timestamp_time="0.120000"
packets_and_frames.frame.13.pkt_duration=2048
packets_and_frames.frame.13.pkt_duration_time="0.040000"
-packets_and_frames.frame.13.pkt_pos="1024828"
+packets_and_frames.frame.13.pkt_pos="1024786"
packets_and_frames.frame.13.pkt_size="30000"
packets_and_frames.frame.13.width=100
packets_and_frames.frame.13.height=100
@@ -488,7 +488,7 @@ streams.stream.0.disposition.visual_impaired=0
streams.stream.0.disposition.clean_effects=0
streams.stream.0.disposition.attached_pic=0
streams.stream.0.tags.E="mc²"
-streams.stream.0.tags.encoder="Lavc55.63.100 pcm_s16le"
+streams.stream.0.tags.encoder="pcm_s16le"
streams.stream.1.index=1
streams.stream.1.codec_name="rawvideo"
streams.stream.1.profile="unknown"
@@ -529,7 +529,7 @@ streams.stream.1.disposition.clean_effects=0
streams.stream.1.disposition.attached_pic=0
streams.stream.1.tags.title="foobar"
streams.stream.1.tags.duration_ts="field-and-tags-conflict-attempt"
-streams.stream.1.tags.encoder="Lavc55.63.100 rawvideo"
+streams.stream.1.tags.encoder="rawvideo"
streams.stream.2.index=2
streams.stream.2.codec_name="rawvideo"
streams.stream.2.profile="unknown"
@@ -568,15 +568,15 @@ streams.stream.2.disposition.hearing_impaired=0
streams.stream.2.disposition.visual_impaired=0
streams.stream.2.disposition.clean_effects=0
streams.stream.2.disposition.attached_pic=0
-streams.stream.2.tags.encoder="Lavc55.63.100 rawvideo"
+streams.stream.2.tags.encoder="rawvideo"
format.filename="tests/data/ffprobe-test.nut"
format.nb_streams=3
format.nb_programs=0
format.format_name="nut"
format.start_time="0.000000"
format.duration="0.120000"
-format.size="1054909"
-format.bit_rate="70327266"
+format.size="1054867"
+format.bit_rate="70324466"
format.probe_score=100
format.tags.title="ffprobe test file"
format.tags.comment="'A comment with CSV, XML & JSON special chars': <tag value=\"x\">"
diff --git a/tests/ref/fate/ffprobe_ini b/tests/ref/fate/ffprobe_ini
index 0fe3e56370..08696461bc 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=669
+pos=627
flags=K
[packets_and_frames.frame.0]
@@ -26,7 +26,7 @@ best_effort_timestamp=0
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
@@ -45,7 +45,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=230400
-pos=2744
+pos=2702
flags=K
[packets_and_frames.frame.1]
@@ -59,7 +59,7 @@ best_effort_timestamp=0
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
@@ -84,7 +84,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=30000
-pos=233165
+pos=233123
flags=K
[packets_and_frames.frame.2]
@@ -98,7 +98,7 @@ best_effort_timestamp=0
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
@@ -123,7 +123,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
-pos=263170
+pos=263128
flags=K
[packets_and_frames.frame.3]
@@ -137,7 +137,7 @@ best_effort_timestamp=1024
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
@@ -156,7 +156,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=230400
-pos=265248
+pos=265206
flags=K
[packets_and_frames.frame.4]
@@ -170,7 +170,7 @@ best_effort_timestamp=2048
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
@@ -195,7 +195,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=30000
-pos=495672
+pos=495630
flags=K
[packets_and_frames.frame.5]
@@ -209,7 +209,7 @@ best_effort_timestamp=2048
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
@@ -234,7 +234,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
-pos=525677
+pos=525635
flags=K
[packets_and_frames.frame.6]
@@ -248,7 +248,7 @@ best_effort_timestamp=2048
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
@@ -267,7 +267,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
-pos=527748
+pos=527706
flags=K
[packets_and_frames.frame.7]
@@ -281,7 +281,7 @@ best_effort_timestamp=3072
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
@@ -300,7 +300,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=230400
-pos=529826
+pos=529784
flags=K
[packets_and_frames.frame.8]
@@ -314,7 +314,7 @@ best_effort_timestamp=4096
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
@@ -339,7 +339,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=30000
-pos=760250
+pos=760208
flags=K
[packets_and_frames.frame.9]
@@ -353,7 +353,7 @@ best_effort_timestamp=4096
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
@@ -378,7 +378,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
-pos=790255
+pos=790213
flags=K
[packets_and_frames.frame.10]
@@ -392,7 +392,7 @@ best_effort_timestamp=4096
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
@@ -411,7 +411,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
-pos=792326
+pos=792284
flags=K
[packets_and_frames.frame.11]
@@ -425,7 +425,7 @@ best_effort_timestamp=5120
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
@@ -444,7 +444,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=230400
-pos=794404
+pos=794362
flags=K
[packets_and_frames.frame.12]
@@ -458,7 +458,7 @@ best_effort_timestamp=6144
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
@@ -483,7 +483,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=30000
-pos=1024828
+pos=1024786
flags=K
[packets_and_frames.frame.13]
@@ -497,7 +497,7 @@ best_effort_timestamp=6144
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
@@ -551,7 +551,7 @@ attached_pic=0
[streams.stream.0.tags]
E=mc²
-encoder=Lavc55.63.100 pcm_s16le
+encoder=pcm_s16le
[streams.stream.1]
index=1
@@ -598,7 +598,7 @@ attached_pic=0
[streams.stream.1.tags]
title=foobar
duration_ts=field-and-tags-conflict-attempt
-encoder=Lavc55.63.100 rawvideo
+encoder=rawvideo
[streams.stream.2]
index=2
@@ -643,7 +643,7 @@ clean_effects=0
attached_pic=0
[streams.stream.2.tags]
-encoder=Lavc55.63.100 rawvideo
+encoder=rawvideo
[format]
filename=tests/data/ffprobe-test.nut
@@ -652,8 +652,8 @@ nb_programs=0
format_name=nut
start_time=0.000000
duration=0.120000
-size=1054909
-bit_rate=70327266
+size=1054867
+bit_rate=70324466
probe_score=100
[format.tags]
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",
diff --git a/tests/ref/fate/ffprobe_xml b/tests/ref/fate/ffprobe_xml
index b4df732cf2..7db8c784b1 100644
--- a/tests/ref/fate/ffprobe_xml
+++ b/tests/ref/fate/ffprobe_xml
@@ -1,55 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
<ffprobe>
<packets_and_frames>
- <packet codec_type="audio" stream_index="0" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="1024" duration_time="0.023220" size="2048" pos="669" flags="K"/>
- <frame media_type="audio" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" best_effort_timestamp="0" best_effort_timestamp_time="0.000000" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="669" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
- <packet codec_type="video" stream_index="1" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="2048" duration_time="0.040000" size="230400" pos="2744" flags="K"/>
- <frame media_type="video" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" best_effort_timestamp="0" best_effort_timestamp_time="0.000000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="2744" pkt_size="230400" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
- <packet codec_type="video" stream_index="2" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="2048" duration_time="0.040000" size="30000" pos="233165" flags="K"/>
- <frame media_type="video" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" best_effort_timestamp="0" best_effort_timestamp_time="0.000000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="233165" pkt_size="30000" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
- <packet codec_type="audio" stream_index="0" pts="1024" pts_time="0.023220" dts="1024" dts_time="0.023220" duration="1024" duration_time="0.023220" size="2048" pos="263170" flags="K"/>
- <frame media_type="audio" key_frame="1" pkt_pts="1024" pkt_pts_time="0.023220" pkt_dts="1024" pkt_dts_time="0.023220" best_effort_timestamp="1024" best_effort_timestamp_time="0.023220" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="263170" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
- <packet codec_type="video" stream_index="1" pts="2048" pts_time="0.040000" dts="2048" dts_time="0.040000" duration="2048" duration_time="0.040000" size="230400" pos="265248" flags="K"/>
- <frame media_type="video" key_frame="1" pkt_pts="2048" pkt_pts_time="0.040000" pkt_dts="2048" pkt_dts_time="0.040000" best_effort_timestamp="2048" best_effort_timestamp_time="0.040000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="265248" pkt_size="230400" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
- <packet codec_type="video" stream_index="2" pts="2048" pts_time="0.040000" dts="2048" dts_time="0.040000" duration="2048" duration_time="0.040000" size="30000" pos="495672" flags="K"/>
- <frame media_type="video" key_frame="1" pkt_pts="2048" pkt_pts_time="0.040000" pkt_dts="2048" pkt_dts_time="0.040000" best_effort_timestamp="2048" best_effort_timestamp_time="0.040000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="495672" pkt_size="30000" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
- <packet codec_type="audio" stream_index="0" pts="2048" pts_time="0.046440" dts="2048" dts_time="0.046440" duration="1024" duration_time="0.023220" size="2048" pos="525677" flags="K"/>
- <frame media_type="audio" key_frame="1" pkt_pts="2048" pkt_pts_time="0.046440" pkt_dts="2048" pkt_dts_time="0.046440" best_effort_timestamp="2048" best_effort_timestamp_time="0.046440" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="525677" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
- <packet codec_type="audio" stream_index="0" pts="3072" pts_time="0.069660" dts="3072" dts_time="0.069660" duration="1024" duration_time="0.023220" size="2048" pos="527748" flags="K"/>
- <frame media_type="audio" key_frame="1" pkt_pts="3072" pkt_pts_time="0.069660" pkt_dts="3072" pkt_dts_time="0.069660" best_effort_timestamp="3072" best_effort_timestamp_time="0.069660" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="527748" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
- <packet codec_type="video" stream_index="1" pts="4096" pts_time="0.080000" dts="4096" dts_time="0.080000" duration="2048" duration_time="0.040000" size="230400" pos="529826" flags="K"/>
- <frame media_type="video" key_frame="1" pkt_pts="4096" pkt_pts_time="0.080000" pkt_dts="4096" pkt_dts_time="0.080000" best_effort_timestamp="4096" best_effort_timestamp_time="0.080000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="529826" pkt_size="230400" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
- <packet codec_type="video" stream_index="2" pts="4096" pts_time="0.080000" dts="4096" dts_time="0.080000" duration="2048" duration_time="0.040000" size="30000" pos="760250" flags="K"/>
- <frame media_type="video" key_frame="1" pkt_pts="4096" pkt_pts_time="0.080000" pkt_dts="4096" pkt_dts_time="0.080000" best_effort_timestamp="4096" best_effort_timestamp_time="0.080000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="760250" pkt_size="30000" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
- <packet codec_type="audio" stream_index="0" pts="4096" pts_time="0.092880" dts="4096" dts_time="0.092880" duration="1024" duration_time="0.023220" size="2048" pos="790255" flags="K"/>
- <frame media_type="audio" key_frame="1" pkt_pts="4096" pkt_pts_time="0.092880" pkt_dts="4096" pkt_dts_time="0.092880" best_effort_timestamp="4096" best_effort_timestamp_time="0.092880" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="790255" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
- <packet codec_type="audio" stream_index="0" pts="5120" pts_time="0.116100" dts="5120" dts_time="0.116100" duration="1024" duration_time="0.023220" size="2048" pos="792326" flags="K"/>
- <frame media_type="audio" key_frame="1" pkt_pts="5120" pkt_pts_time="0.116100" pkt_dts="5120" pkt_dts_time="0.116100" best_effort_timestamp="5120" best_effort_timestamp_time="0.116100" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="792326" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
- <packet codec_type="video" stream_index="1" pts="6144" pts_time="0.120000" dts="6144" dts_time="0.120000" duration="2048" duration_time="0.040000" size="230400" pos="794404" flags="K"/>
- <frame media_type="video" key_frame="1" pkt_pts="6144" pkt_pts_time="0.120000" pkt_dts="6144" pkt_dts_time="0.120000" best_effort_timestamp="6144" best_effort_timestamp_time="0.120000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="794404" pkt_size="230400" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
- <packet codec_type="video" stream_index="2" pts="6144" pts_time="0.120000" dts="6144" dts_time="0.120000" duration="2048" duration_time="0.040000" size="30000" pos="1024828" flags="K"/>
- <frame media_type="video" key_frame="1" pkt_pts="6144" pkt_pts_time="0.120000" pkt_dts="6144" pkt_dts_time="0.120000" best_effort_timestamp="6144" best_effort_timestamp_time="0.120000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="1024828" pkt_size="30000" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
+ <packet codec_type="audio" stream_index="0" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="1024" duration_time="0.023220" size="2048" pos="627" flags="K"/>
+ <frame media_type="audio" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" best_effort_timestamp="0" best_effort_timestamp_time="0.000000" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="627" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
+ <packet codec_type="video" stream_index="1" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="2048" duration_time="0.040000" size="230400" pos="2702" flags="K"/>
+ <frame media_type="video" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" best_effort_timestamp="0" best_effort_timestamp_time="0.000000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="2702" pkt_size="230400" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
+ <packet codec_type="video" stream_index="2" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="2048" duration_time="0.040000" size="30000" pos="233123" flags="K"/>
+ <frame media_type="video" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" best_effort_timestamp="0" best_effort_timestamp_time="0.000000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="233123" pkt_size="30000" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
+ <packet codec_type="audio" stream_index="0" pts="1024" pts_time="0.023220" dts="1024" dts_time="0.023220" duration="1024" duration_time="0.023220" size="2048" pos="263128" flags="K"/>
+ <frame media_type="audio" key_frame="1" pkt_pts="1024" pkt_pts_time="0.023220" pkt_dts="1024" pkt_dts_time="0.023220" best_effort_timestamp="1024" best_effort_timestamp_time="0.023220" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="263128" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
+ <packet codec_type="video" stream_index="1" pts="2048" pts_time="0.040000" dts="2048" dts_time="0.040000" duration="2048" duration_time="0.040000" size="230400" pos="265206" flags="K"/>
+ <frame media_type="video" key_frame="1" pkt_pts="2048" pkt_pts_time="0.040000" pkt_dts="2048" pkt_dts_time="0.040000" best_effort_timestamp="2048" best_effort_timestamp_time="0.040000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="265206" pkt_size="230400" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
+ <packet codec_type="video" stream_index="2" pts="2048" pts_time="0.040000" dts="2048" dts_time="0.040000" duration="2048" duration_time="0.040000" size="30000" pos="495630" flags="K"/>
+ <frame media_type="video" key_frame="1" pkt_pts="2048" pkt_pts_time="0.040000" pkt_dts="2048" pkt_dts_time="0.040000" best_effort_timestamp="2048" best_effort_timestamp_time="0.040000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="495630" pkt_size="30000" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
+ <packet codec_type="audio" stream_index="0" pts="2048" pts_time="0.046440" dts="2048" dts_time="0.046440" duration="1024" duration_time="0.023220" size="2048" pos="525635" flags="K"/>
+ <frame media_type="audio" key_frame="1" pkt_pts="2048" pkt_pts_time="0.046440" pkt_dts="2048" pkt_dts_time="0.046440" best_effort_timestamp="2048" best_effort_timestamp_time="0.046440" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="525635" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
+ <packet codec_type="audio" stream_index="0" pts="3072" pts_time="0.069660" dts="3072" dts_time="0.069660" duration="1024" duration_time="0.023220" size="2048" pos="527706" flags="K"/>
+ <frame media_type="audio" key_frame="1" pkt_pts="3072" pkt_pts_time="0.069660" pkt_dts="3072" pkt_dts_time="0.069660" best_effort_timestamp="3072" best_effort_timestamp_time="0.069660" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="527706" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
+ <packet codec_type="video" stream_index="1" pts="4096" pts_time="0.080000" dts="4096" dts_time="0.080000" duration="2048" duration_time="0.040000" size="230400" pos="529784" flags="K"/>
+ <frame media_type="video" key_frame="1" pkt_pts="4096" pkt_pts_time="0.080000" pkt_dts="4096" pkt_dts_time="0.080000" best_effort_timestamp="4096" best_effort_timestamp_time="0.080000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="529784" pkt_size="230400" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
+ <packet codec_type="video" stream_index="2" pts="4096" pts_time="0.080000" dts="4096" dts_time="0.080000" duration="2048" duration_time="0.040000" size="30000" pos="760208" flags="K"/>
+ <frame media_type="video" key_frame="1" pkt_pts="4096" pkt_pts_time="0.080000" pkt_dts="4096" pkt_dts_time="0.080000" best_effort_timestamp="4096" best_effort_timestamp_time="0.080000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="760208" pkt_size="30000" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
+ <packet codec_type="audio" stream_index="0" pts="4096" pts_time="0.092880" dts="4096" dts_time="0.092880" duration="1024" duration_time="0.023220" size="2048" pos="790213" flags="K"/>
+ <frame media_type="audio" key_frame="1" pkt_pts="4096" pkt_pts_time="0.092880" pkt_dts="4096" pkt_dts_time="0.092880" best_effort_timestamp="4096" best_effort_timestamp_time="0.092880" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="790213" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
+ <packet codec_type="audio" stream_index="0" pts="5120" pts_time="0.116100" dts="5120" dts_time="0.116100" duration="1024" duration_time="0.023220" size="2048" pos="792284" flags="K"/>
+ <frame media_type="audio" key_frame="1" pkt_pts="5120" pkt_pts_time="0.116100" pkt_dts="5120" pkt_dts_time="0.116100" best_effort_timestamp="5120" best_effort_timestamp_time="0.116100" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="792284" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
+ <packet codec_type="video" stream_index="1" pts="6144" pts_time="0.120000" dts="6144" dts_time="0.120000" duration="2048" duration_time="0.040000" size="230400" pos="794362" flags="K"/>
+ <frame media_type="video" key_frame="1" pkt_pts="6144" pkt_pts_time="0.120000" pkt_dts="6144" pkt_dts_time="0.120000" best_effort_timestamp="6144" best_effort_timestamp_time="0.120000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="794362" pkt_size="230400" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
+ <packet codec_type="video" stream_index="2" pts="6144" pts_time="0.120000" dts="6144" dts_time="0.120000" duration="2048" duration_time="0.040000" size="30000" pos="1024786" flags="K"/>
+ <frame media_type="video" key_frame="1" pkt_pts="6144" pkt_pts_time="0.120000" pkt_dts="6144" pkt_dts_time="0.120000" best_effort_timestamp="6144" best_effort_timestamp_time="0.120000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="1024786" pkt_size="30000" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
</packets_and_frames>
<streams>
<stream index="0" codec_name="pcm_s16le" codec_type="audio" codec_time_base="1/44100" codec_tag_string="PSD[16]" codec_tag="0x10445350" sample_fmt="s16" sample_rate="44100" channels="1" bits_per_sample="16" r_frame_rate="0/0" avg_frame_rate="0/0" time_base="1/44100" start_pts="0" start_time="0.000000" bit_rate="705600" nb_read_frames="6" nb_read_packets="6">
<disposition default="0" dub="0" original="0" comment="0" lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0" clean_effects="0" attached_pic="0"/>
<tag key="E" value="mc²"/>
- <tag key="encoder" value="Lavc55.63.100 pcm_s16le"/>
+ <tag key="encoder" value="pcm_s16le"/>
</stream>
<stream index="1" codec_name="rawvideo" codec_type="video" codec_time_base="1/51200" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="320" height="240" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="4:3" pix_fmt="rgb24" level="-99" r_frame_rate="25/1" avg_frame_rate="25/1" time_base="1/51200" start_pts="0" start_time="0.000000" nb_read_frames="4" nb_read_packets="4">
<disposition default="0" dub="0" original="0" comment="0" lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0" clean_effects="0" attached_pic="0"/>
<tag key="title" value="foobar"/>
<tag key="duration_ts" value="field-and-tags-conflict-attempt"/>
- <tag key="encoder" value="Lavc55.63.100 rawvideo"/>
+ <tag key="encoder" value="rawvideo"/>
</stream>
<stream index="2" codec_name="rawvideo" codec_type="video" codec_time_base="1/51200" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="100" height="100" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="1:1" pix_fmt="rgb24" level="-99" r_frame_rate="25/1" avg_frame_rate="25/1" time_base="1/51200" start_pts="0" start_time="0.000000" nb_read_frames="4" nb_read_packets="4">
<disposition default="0" dub="0" original="0" comment="0" lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0" clean_effects="0" attached_pic="0"/>
- <tag key="encoder" value="Lavc55.63.100 rawvideo"/>
+ <tag key="encoder" value="rawvideo"/>
</stream>
</streams>
- <format filename="tests/data/ffprobe-test.nut" nb_streams="3" nb_programs="0" format_name="nut" start_time="0.000000" duration="0.120000" size="1054909" bit_rate="70327266" probe_score="100">
+ <format filename="tests/data/ffprobe-test.nut" nb_streams="3" nb_programs="0" format_name="nut" start_time="0.000000" duration="0.120000" size="1054867" bit_rate="70324466" probe_score="100">
<tag key="title" value="ffprobe test file"/>
<tag key="comment" value="&apos;A comment with CSV, XML &amp; JSON special chars&apos;: &lt;tag value=&quot;x&quot;&gt;"/>
<tag key="comment2" value="I ♥ Üñîçød€"/>