Hi!
Attached patch changes ffprobe-test.nut and the ffprobe test output.
It will allow to fix ticket #4455 easily by removing the avdevice
dependency from the call to ffmpeg.
I don't know how to add the avdevice dependency to tests/Makefile.
Please comment, Carl Eugen
diff --git a/tests/Makefile b/tests/Makefile
index 8505211..56bf6f3 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -50,6 +50,7 @@ tests/data/ffprobe-test.nut: ffmpeg$(EXESUF)
tests/test_copy.ffmeta
-flags +bitexact -map 0:0 -map 0:1 -map 0:2 -map_metadata 1 \
-map_metadata:s:0 1:s:0 -map_metadata:s:1 1:s:1 \
-vcodec rawvideo -acodec pcm_s16le \
+ -disposition:0 default \
-y $(TARGET_PATH)/$@ 2>/dev/null
tests/data/%.sw tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm
tests/data/%.nut: TAG = GEN
diff --git a/tests/ref/fate/ffprobe_compact b/tests/ref/fate/ffprobe_compact
index fb0b834..c342e07 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=642|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=642|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=2717|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=2717|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=233138|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=233138|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=263143|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=263143|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=265221|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=265221|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=495645|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=495645|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=525650|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=525650|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=527721|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=527721|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=529799|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=529799|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=760223|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=760223|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=790228|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=790228|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=792299|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=792299|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=794377|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=794377|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=1024801|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=1024801|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|max_bit_rate=N/A|bits_per_raw_sample=N/A|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=Lavc
pcm_s16le
+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=663|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=663|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=2738|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=2738|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=233159|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=233159|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=263164|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=263164|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=265242|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=265242|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=495666|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=495666|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=525671|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=525671|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=527742|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=527742|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=529820|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=529820|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=760244|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=760244|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=790249|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=790249|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=792320|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=792320|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=794398|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=794398|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=1024822|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=1024822|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|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=6|nb_read_packets=6|disposition:default=1|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=Lavc
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|coded_width=320|coded_height=240|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=4:3|pix_fmt=rgb24|level=-99|color_range=N/A|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=unspecified|timecode=N/A|refs=1|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|max_bit_rate=N/A|bits_per_raw_sample=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=Lavc
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|coded_width=100|coded_height=100|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=1:1|pix_fmt=rgb24|level=-99|color_range=N/A|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=unspecified|timecode=N/A|refs=1|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|max_bit_rate=N/A|bits_per_raw_sample=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=Lavc
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=1054882|bit_rate=70325466|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â¬
+format|filename=tests/data/ffprobe-test.nut|nb_streams=3|nb_programs=0|format_name=nut|start_time=0.000000|duration=0.120000|size=1054903|bit_rate=70326866|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 496477f..bd1123c 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,642,K
-frame,audio,1,0,0.000000,0,0.000000,0,0.000000,1024,0.023220,642,2048,s16,1024,1,unknown
-packet,video,1,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,230400,2717,K
-frame,video,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,2717,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,233138,K
-frame,video,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,233138,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,263143,K
-frame,audio,1,1024,0.023220,1024,0.023220,1024,0.023220,1024,0.023220,263143,2048,s16,1024,1,unknown
-packet,video,1,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,230400,265221,K
-frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,265221,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,495645,K
-frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,495645,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,525650,K
-frame,audio,1,2048,0.046440,2048,0.046440,2048,0.046440,1024,0.023220,525650,2048,s16,1024,1,unknown
-packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/A,N/A,2048,527721,K
-frame,audio,1,3072,0.069660,3072,0.069660,3072,0.069660,1024,0.023220,527721,2048,s16,1024,1,unknown
-packet,video,1,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,230400,529799,K
-frame,video,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,529799,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,760223,K
-frame,video,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,760223,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,790228,K
-frame,audio,1,4096,0.092880,4096,0.092880,4096,0.092880,1024,0.023220,790228,2048,s16,1024,1,unknown
-packet,audio,0,5120,0.116100,5120,0.116100,1024,0.023220,N/A,N/A,2048,792299,K
-frame,audio,1,5120,0.116100,5120,0.116100,5120,0.116100,1024,0.023220,792299,2048,s16,1024,1,unknown
-packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,230400,794377,K
-frame,video,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,794377,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,1024801,K
-frame,video,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,1024801,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,N/A,N/A,6,6,0,0,0,0,0,0,0,0,0,0,0,mc²,Lavc
pcm_s16le
+packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,663,K
+frame,audio,1,0,0.000000,0,0.000000,0,0.000000,1024,0.023220,663,2048,s16,1024,1,unknown
+packet,video,1,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,230400,2738,K
+frame,video,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,2738,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,233159,K
+frame,video,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,233159,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,263164,K
+frame,audio,1,1024,0.023220,1024,0.023220,1024,0.023220,1024,0.023220,263164,2048,s16,1024,1,unknown
+packet,video,1,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,230400,265242,K
+frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,265242,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,495666,K
+frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,495666,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,525671,K
+frame,audio,1,2048,0.046440,2048,0.046440,2048,0.046440,1024,0.023220,525671,2048,s16,1024,1,unknown
+packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/A,N/A,2048,527742,K
+frame,audio,1,3072,0.069660,3072,0.069660,3072,0.069660,1024,0.023220,527742,2048,s16,1024,1,unknown
+packet,video,1,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,230400,529820,K
+frame,video,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,529820,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,760244,K
+frame,video,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,760244,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,790249,K
+frame,audio,1,4096,0.092880,4096,0.092880,4096,0.092880,1024,0.023220,790249,2048,s16,1024,1,unknown
+packet,audio,0,5120,0.116100,5120,0.116100,1024,0.023220,N/A,N/A,2048,792320,K
+frame,audio,1,5120,0.116100,5120,0.116100,5120,0.116100,1024,0.023220,792320,2048,s16,1024,1,unknown
+packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,230400,794398,K
+frame,video,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,794398,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,1024822,K
+frame,video,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,1024822,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,N/A,N/A,6,6,1,0,0,0,0,0,0,0,0,0,0,mc²,Lavc
pcm_s16le
stream,1,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,320,240,320,240,0,1:1,4:3,rgb24,-99,N/A,unknown,unknown,unknown,unspecified,N/A,1,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,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,Lavc
rawvideo
stream,2,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,100,100,100,100,0,1:1,1:1,rgb24,-99,N/A,unknown,unknown,unknown,unspecified,N/A,1,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,Lavc
rawvideo
-format,tests/data/ffprobe-test.nut,3,0,nut,0.000000,0.120000,1054882,70325466,100,ffprobe
test file,"'A comment with CSV, XML & JSON special chars': <tag
value=""x"">",I ⥠Ãñîçødâ¬
+format,tests/data/ffprobe-test.nut,3,0,nut,0.000000,0.120000,1054903,70326866,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 123208a..da44603 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=642
+pos=663
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=642
+pkt_pos=663
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=2717
+pos=2738
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=2717
+pkt_pos=2738
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=233138
+pos=233159
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=233138
+pkt_pos=233159
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=263143
+pos=263164
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=263143
+pkt_pos=263164
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=265221
+pos=265242
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=265221
+pkt_pos=265242
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=495645
+pos=495666
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=495645
+pkt_pos=495666
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=525650
+pos=525671
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=525650
+pkt_pos=525671
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=527721
+pos=527742
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=527721
+pkt_pos=527742
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=529799
+pos=529820
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=529799
+pkt_pos=529820
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=760223
+pos=760244
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=760223
+pkt_pos=760244
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=790228
+pos=790249
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=790228
+pkt_pos=790249
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=792299
+pos=792320
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=792299
+pkt_pos=792320
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=794377
+pos=794398
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=794377
+pkt_pos=794398
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=1024801
+pos=1024822
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=1024801
+pkt_pos=1024822
pkt_size=30000
width=100
height=100
@@ -535,7 +535,7 @@ bits_per_raw_sample=N/A
nb_frames=N/A
nb_read_frames=6
nb_read_packets=6
-DISPOSITION:default=0
+DISPOSITION:default=1
DISPOSITION:dub=0
DISPOSITION:original=0
DISPOSITION:comment=0
@@ -660,8 +660,8 @@ nb_programs=0
format_name=nut
start_time=0.000000
duration=0.120000
-size=1054882
-bit_rate=70325466
+size=1054903
+bit_rate=70326866
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 5c02a21..ddace97 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="642"
+packets_and_frames.packet.0.pos="663"
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="642"
+packets_and_frames.frame.0.pkt_pos="663"
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="2717"
+packets_and_frames.packet.1.pos="2738"
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="2717"
+packets_and_frames.frame.1.pkt_pos="2738"
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="233138"
+packets_and_frames.packet.2.pos="233159"
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="233138"
+packets_and_frames.frame.2.pkt_pos="233159"
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="263143"
+packets_and_frames.packet.3.pos="263164"
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="263143"
+packets_and_frames.frame.3.pkt_pos="263164"
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="265221"
+packets_and_frames.packet.4.pos="265242"
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="265221"
+packets_and_frames.frame.4.pkt_pos="265242"
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="495645"
+packets_and_frames.packet.5.pos="495666"
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="495645"
+packets_and_frames.frame.5.pkt_pos="495666"
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="525650"
+packets_and_frames.packet.6.pos="525671"
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="525650"
+packets_and_frames.frame.6.pkt_pos="525671"
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="527721"
+packets_and_frames.packet.7.pos="527742"
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="527721"
+packets_and_frames.frame.7.pkt_pos="527742"
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="529799"
+packets_and_frames.packet.8.pos="529820"
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="529799"
+packets_and_frames.frame.8.pkt_pos="529820"
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="760223"
+packets_and_frames.packet.9.pos="760244"
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="760223"
+packets_and_frames.frame.9.pkt_pos="760244"
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="790228"
+packets_and_frames.packet.10.pos="790249"
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="790228"
+packets_and_frames.frame.10.pkt_pos="790249"
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="792299"
+packets_and_frames.packet.11.pos="792320"
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="792299"
+packets_and_frames.frame.11.pkt_pos="792320"
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="794377"
+packets_and_frames.packet.12.pos="794398"
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="794377"
+packets_and_frames.frame.12.pkt_pos="794398"
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="1024801"
+packets_and_frames.packet.13.pos="1024822"
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="1024801"
+packets_and_frames.frame.13.pkt_pos="1024822"
packets_and_frames.frame.13.pkt_size="30000"
packets_and_frames.frame.13.width=100
packets_and_frames.frame.13.height=100
@@ -478,7 +478,7 @@ streams.stream.0.bits_per_raw_sample="N/A"
streams.stream.0.nb_frames="N/A"
streams.stream.0.nb_read_frames="6"
streams.stream.0.nb_read_packets="6"
-streams.stream.0.disposition.default=0
+streams.stream.0.disposition.default=1
streams.stream.0.disposition.dub=0
streams.stream.0.disposition.original=0
streams.stream.0.disposition.comment=0
@@ -597,8 +597,8 @@ format.nb_programs=0
format.format_name="nut"
format.start_time="0.000000"
format.duration="0.120000"
-format.size="1054882"
-format.bit_rate="70325466"
+format.size="1054903"
+format.bit_rate="70326866"
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 e30c2fe..8f816ec 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=642
+pos=663
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=642
+pkt_pos=663
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=2717
+pos=2738
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=2717
+pkt_pos=2738
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=233138
+pos=233159
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=233138
+pkt_pos=233159
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=263143
+pos=263164
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=263143
+pkt_pos=263164
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=265221
+pos=265242
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=265221
+pkt_pos=265242
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=495645
+pos=495666
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=495645
+pkt_pos=495666
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=525650
+pos=525671
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=525650
+pkt_pos=525671
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=527721
+pos=527742
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=527721
+pkt_pos=527742
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=529799
+pos=529820
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=529799
+pkt_pos=529820
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=760223
+pos=760244
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=760223
+pkt_pos=760244
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=790228
+pos=790249
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=790228
+pkt_pos=790249
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=792299
+pos=792320
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=792299
+pkt_pos=792320
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=794377
+pos=794398
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=794377
+pkt_pos=794398
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=1024801
+pos=1024822
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=1024801
+pkt_pos=1024822
pkt_size=30000
width=100
height=100
@@ -539,7 +539,7 @@ nb_read_frames=6
nb_read_packets=6
[streams.stream.0.disposition]
-default=0
+default=1
dub=0
original=0
comment=0
@@ -674,8 +674,8 @@ nb_programs=0
format_name=nut
start_time=0.000000
duration=0.120000
-size=1054882
-bit_rate=70325466
+size=1054903
+bit_rate=70326866
probe_score=100
[format.tags]
diff --git a/tests/ref/fate/ffprobe_json b/tests/ref/fate/ffprobe_json
index ee2f8e6..f8ddf1b 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": "642",
+ "pos": "663",
"flags": "K"
},
{
@@ -26,7 +26,7 @@
"best_effort_timestamp_time": "0.000000",
"pkt_duration": 1024,
"pkt_duration_time": "0.023220",
- "pkt_pos": "642",
+ "pkt_pos": "663",
"pkt_size": "2048",
"sample_fmt": "s16",
"nb_samples": 1024,
@@ -43,7 +43,7 @@
"duration": 2048,
"duration_time": "0.040000",
"size": "230400",
- "pos": "2717",
+ "pos": "2738",
"flags": "K"
},
{
@@ -58,7 +58,7 @@
"best_effort_timestamp_time": "0.000000",
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
- "pkt_pos": "2717",
+ "pkt_pos": "2738",
"pkt_size": "230400",
"width": 320,
"height": 240,
@@ -82,7 +82,7 @@
"duration": 2048,
"duration_time": "0.040000",
"size": "30000",
- "pos": "233138",
+ "pos": "233159",
"flags": "K"
},
{
@@ -97,7 +97,7 @@
"best_effort_timestamp_time": "0.000000",
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
- "pkt_pos": "233138",
+ "pkt_pos": "233159",
"pkt_size": "30000",
"width": 100,
"height": 100,
@@ -121,7 +121,7 @@
"duration": 1024,
"duration_time": "0.023220",
"size": "2048",
- "pos": "263143",
+ "pos": "263164",
"flags": "K"
},
{
@@ -136,7 +136,7 @@
"best_effort_timestamp_time": "0.023220",
"pkt_duration": 1024,
"pkt_duration_time": "0.023220",
- "pkt_pos": "263143",
+ "pkt_pos": "263164",
"pkt_size": "2048",
"sample_fmt": "s16",
"nb_samples": 1024,
@@ -153,7 +153,7 @@
"duration": 2048,
"duration_time": "0.040000",
"size": "230400",
- "pos": "265221",
+ "pos": "265242",
"flags": "K"
},
{
@@ -168,7 +168,7 @@
"best_effort_timestamp_time": "0.040000",
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
- "pkt_pos": "265221",
+ "pkt_pos": "265242",
"pkt_size": "230400",
"width": 320,
"height": 240,
@@ -192,7 +192,7 @@
"duration": 2048,
"duration_time": "0.040000",
"size": "30000",
- "pos": "495645",
+ "pos": "495666",
"flags": "K"
},
{
@@ -207,7 +207,7 @@
"best_effort_timestamp_time": "0.040000",
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
- "pkt_pos": "495645",
+ "pkt_pos": "495666",
"pkt_size": "30000",
"width": 100,
"height": 100,
@@ -231,7 +231,7 @@
"duration": 1024,
"duration_time": "0.023220",
"size": "2048",
- "pos": "525650",
+ "pos": "525671",
"flags": "K"
},
{
@@ -246,7 +246,7 @@
"best_effort_timestamp_time": "0.046440",
"pkt_duration": 1024,
"pkt_duration_time": "0.023220",
- "pkt_pos": "525650",
+ "pkt_pos": "525671",
"pkt_size": "2048",
"sample_fmt": "s16",
"nb_samples": 1024,
@@ -263,7 +263,7 @@
"duration": 1024,
"duration_time": "0.023220",
"size": "2048",
- "pos": "527721",
+ "pos": "527742",
"flags": "K"
},
{
@@ -278,7 +278,7 @@
"best_effort_timestamp_time": "0.069660",
"pkt_duration": 1024,
"pkt_duration_time": "0.023220",
- "pkt_pos": "527721",
+ "pkt_pos": "527742",
"pkt_size": "2048",
"sample_fmt": "s16",
"nb_samples": 1024,
@@ -295,7 +295,7 @@
"duration": 2048,
"duration_time": "0.040000",
"size": "230400",
- "pos": "529799",
+ "pos": "529820",
"flags": "K"
},
{
@@ -310,7 +310,7 @@
"best_effort_timestamp_time": "0.080000",
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
- "pkt_pos": "529799",
+ "pkt_pos": "529820",
"pkt_size": "230400",
"width": 320,
"height": 240,
@@ -334,7 +334,7 @@
"duration": 2048,
"duration_time": "0.040000",
"size": "30000",
- "pos": "760223",
+ "pos": "760244",
"flags": "K"
},
{
@@ -349,7 +349,7 @@
"best_effort_timestamp_time": "0.080000",
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
- "pkt_pos": "760223",
+ "pkt_pos": "760244",
"pkt_size": "30000",
"width": 100,
"height": 100,
@@ -373,7 +373,7 @@
"duration": 1024,
"duration_time": "0.023220",
"size": "2048",
- "pos": "790228",
+ "pos": "790249",
"flags": "K"
},
{
@@ -388,7 +388,7 @@
"best_effort_timestamp_time": "0.092880",
"pkt_duration": 1024,
"pkt_duration_time": "0.023220",
- "pkt_pos": "790228",
+ "pkt_pos": "790249",
"pkt_size": "2048",
"sample_fmt": "s16",
"nb_samples": 1024,
@@ -405,7 +405,7 @@
"duration": 1024,
"duration_time": "0.023220",
"size": "2048",
- "pos": "792299",
+ "pos": "792320",
"flags": "K"
},
{
@@ -420,7 +420,7 @@
"best_effort_timestamp_time": "0.116100",
"pkt_duration": 1024,
"pkt_duration_time": "0.023220",
- "pkt_pos": "792299",
+ "pkt_pos": "792320",
"pkt_size": "2048",
"sample_fmt": "s16",
"nb_samples": 1024,
@@ -437,7 +437,7 @@
"duration": 2048,
"duration_time": "0.040000",
"size": "230400",
- "pos": "794377",
+ "pos": "794398",
"flags": "K"
},
{
@@ -452,7 +452,7 @@
"best_effort_timestamp_time": "0.120000",
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
- "pkt_pos": "794377",
+ "pkt_pos": "794398",
"pkt_size": "230400",
"width": 320,
"height": 240,
@@ -476,7 +476,7 @@
"duration": 2048,
"duration_time": "0.040000",
"size": "30000",
- "pos": "1024801",
+ "pos": "1024822",
"flags": "K"
},
{
@@ -491,7 +491,7 @@
"best_effort_timestamp_time": "0.120000",
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
- "pkt_pos": "1024801",
+ "pkt_pos": "1024822",
"pkt_size": "30000",
"width": 100,
"height": 100,
@@ -526,7 +526,7 @@
"nb_read_frames": "6",
"nb_read_packets": "6",
"disposition": {
- "default": 0,
+ "default": 1,
"dub": 0,
"original": 0,
"comment": 0,
@@ -635,8 +635,8 @@
"format_name": "nut",
"start_time": "0.000000",
"duration": "0.120000",
- "size": "1054882",
- "bit_rate": "70325466",
+ "size": "1054903",
+ "bit_rate": "70326866",
"probe_score": 100,
"tags": {
"title": "ffprobe test file",
diff --git a/tests/ref/fate/ffprobe_xml b/tests/ref/fate/ffprobe_xml
index 5dad3e7..d0aaed7 100644
--- a/tests/ref/fate/ffprobe_xml
+++ b/tests/ref/fate/ffprobe_xml
@@ -1,39 +1,39 @@
<?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="642" 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="642" 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="2717" 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="2717"
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="233138" 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="233138"
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="263143" 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="263143"
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="265221" 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="265221"
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="495645" 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="495645"
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="525650" 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="525650"
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="527721" 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="527721"
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="529799" 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="529799"
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="760223" 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="760223"
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="790228" 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="790228"
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="792299" 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="792299"
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="794377" 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="794377"
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="1024801" 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="1024801"
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="663" 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="663" 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="2738" 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="2738"
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="233159" 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="233159"
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="263164" 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="263164"
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="265242" 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="265242"
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="495666" 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="495666"
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="525671" 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="525671"
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="527742" 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="527742"
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="529820" 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="529820"
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="760244" 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="760244"
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="790249" 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="790249"
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="792320" 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="792320"
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="794398" 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="794398"
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="1024822" 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="1024822"
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"/>
+ <disposition default="1" 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="Lavc pcm_s16le"/>
</stream>
@@ -49,7 +49,7 @@
</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="1054882" bit_rate="70325466" 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="1054903" bit_rate="70326866" probe_score="100">
<tag key="title" value="ffprobe test file"/>
<tag key="comment" value="'A comment with CSV, XML & JSON
special chars': <tag value="x">"/>
<tag key="comment2" value="I ⥠Ãñîçødâ¬"/>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
