From f7ab23b0d0a8b72a62bd9386a1e48ccc2cf47576 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Sat, 16 Mar 2013 01:22:45 +0100 Subject: [PATCH] ffprobe: remove deprecated frame "reference" field --- doc/ffprobe.xsd | 1 - ffprobe.c | 1 - tests/ref/fate/ffprobe_compact | 16 ++++++++-------- tests/ref/fate/ffprobe_csv | 16 ++++++++-------- tests/ref/fate/ffprobe_default | 8 -------- tests/ref/fate/ffprobe_flat | 8 -------- tests/ref/fate/ffprobe_ini | 8 -------- tests/ref/fate/ffprobe_json | 24 ++++++++---------------- tests/ref/fate/ffprobe_xml | 16 ++++++++-------- 9 files changed, 32 insertions(+), 66 deletions(-) diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd index d9c6655464..eab97fb4c4 100644 --- a/doc/ffprobe.xsd +++ b/doc/ffprobe.xsd @@ -78,7 +78,6 @@ - diff --git a/ffprobe.c b/ffprobe.c index 72e3bb093f..ef9bef44c7 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -1500,7 +1500,6 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream, print_int("interlaced_frame", frame->interlaced_frame); print_int("top_field_first", frame->top_field_first); print_int("repeat_pict", frame->repeat_pict); - print_int("reference", frame->reference); break; case AVMEDIA_TYPE_AUDIO: diff --git a/tests/ref/fate/ffprobe_compact b/tests/ref/fate/ffprobe_compact index e5679133f9..36d19ceb34 100644 --- a/tests/ref/fate/ffprobe_compact +++ b/tests/ref/fate/ffprobe_compact @@ -1,31 +1,31 @@ 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=572|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|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=572|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=mono 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=2647|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|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=2647|pkt_size=N/A|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|reference=0 +frame|media_type=video|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=2647|pkt_size=N/A|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=233068|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|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=233068|pkt_size=N/A|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|reference=0 +frame|media_type=video|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=233068|pkt_size=N/A|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=263073|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|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=263073|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=mono 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=265151|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|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=265151|pkt_size=N/A|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|reference=0 +frame|media_type=video|key_frame=1|pkt_pts=2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0.040000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=265151|pkt_size=N/A|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=495575|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|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=495575|pkt_size=N/A|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|reference=0 +frame|media_type=video|key_frame=1|pkt_pts=2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0.040000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=495575|pkt_size=N/A|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=525580|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|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=525580|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=mono 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=527651|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|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=527651|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=mono 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=529729|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|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=529729|pkt_size=N/A|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|reference=0 +frame|media_type=video|key_frame=1|pkt_pts=4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0.080000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=529729|pkt_size=N/A|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=760153|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|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=760153|pkt_size=N/A|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|reference=0 +frame|media_type=video|key_frame=1|pkt_pts=4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0.080000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=760153|pkt_size=N/A|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=790158|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|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=790158|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=mono 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=792229|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|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=792229|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=mono 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=794307|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|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=794307|pkt_size=N/A|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|reference=0 +frame|media_type=video|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=794307|pkt_size=N/A|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=1024731|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|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=1024731|pkt_size=N/A|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|reference=0 +frame|media_type=video|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=1024731|pkt_size=N/A|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|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=527406|duration=11.959320|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² 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=612317|duration=11.959316|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 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=612317|duration=11.959316|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 diff --git a/tests/ref/fate/ffprobe_csv b/tests/ref/fate/ffprobe_csv index 8defbc9de1..575eb764be 100644 --- a/tests/ref/fate/ffprobe_csv +++ b/tests/ref/fate/ffprobe_csv @@ -1,31 +1,31 @@ packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,572,K frame,audio,1,0,0.000000,0,0.000000,1024,0.023220,572,2048,s16,1024,1,mono packet,video,1,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,230400,2647,K -frame,video,1,0,0.000000,0,0.000000,2048,0.040000,2647,N/A,320,240,rgb24,1:1,I,0,0,0,0,0,0 +frame,video,1,0,0.000000,0,0.000000,2048,0.040000,2647,N/A,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,233068,K -frame,video,1,0,0.000000,0,0.000000,2048,0.040000,233068,N/A,100,100,rgb24,1:1,I,0,0,0,0,0,0 +frame,video,1,0,0.000000,0,0.000000,2048,0.040000,233068,N/A,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,263073,K frame,audio,1,1024,0.023220,1024,0.023220,1024,0.023220,263073,2048,s16,1024,1,mono packet,video,1,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,230400,265151,K -frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,265151,N/A,320,240,rgb24,1:1,I,0,0,0,0,0,0 +frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,265151,N/A,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,495575,K -frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,495575,N/A,100,100,rgb24,1:1,I,0,0,0,0,0,0 +frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,495575,N/A,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,525580,K frame,audio,1,2048,0.046440,2048,0.046440,1024,0.023220,525580,2048,s16,1024,1,mono packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/A,N/A,2048,527651,K frame,audio,1,3072,0.069660,3072,0.069660,1024,0.023220,527651,2048,s16,1024,1,mono packet,video,1,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,230400,529729,K -frame,video,1,4096,0.080000,4096,0.080000,2048,0.040000,529729,N/A,320,240,rgb24,1:1,I,0,0,0,0,0,0 +frame,video,1,4096,0.080000,4096,0.080000,2048,0.040000,529729,N/A,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,760153,K -frame,video,1,4096,0.080000,4096,0.080000,2048,0.040000,760153,N/A,100,100,rgb24,1:1,I,0,0,0,0,0,0 +frame,video,1,4096,0.080000,4096,0.080000,2048,0.040000,760153,N/A,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,790158,K frame,audio,1,4096,0.092880,4096,0.092880,1024,0.023220,790158,2048,s16,1024,1,mono packet,audio,0,5120,0.116100,5120,0.116100,1024,0.023220,N/A,N/A,2048,792229,K frame,audio,1,5120,0.116100,5120,0.116100,1024,0.023220,792229,2048,s16,1024,1,mono packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,230400,794307,K -frame,video,1,6144,0.120000,6144,0.120000,2048,0.040000,794307,N/A,320,240,rgb24,1:1,I,0,0,0,0,0,0 +frame,video,1,6144,0.120000,6144,0.120000,2048,0.040000,794307,N/A,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,1024731,K -frame,video,1,6144,0.120000,6144,0.120000,2048,0.040000,1024731,N/A,100,100,rgb24,1:1,I,0,0,0,0,0,0 +frame,video,1,6144,0.120000,6144,0.120000,2048,0.040000,1024731,N/A,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,16,N/A,0/0,0/0,1/44100,0,0.000000,527406,11.959320,705600,N/A,6,6,0,0,0,0,0,0,0,0,0,0,0,mc² 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,612317,11.959316,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,foobar,field-and-tags-conflict-attempt 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,612317,11.959316,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0 diff --git a/tests/ref/fate/ffprobe_default b/tests/ref/fate/ffprobe_default index 4151b45058..26922c135d 100644 --- a/tests/ref/fate/ffprobe_default +++ b/tests/ref/fate/ffprobe_default @@ -65,7 +65,6 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 -reference=0 [/FRAME] [PACKET] codec_type=video @@ -103,7 +102,6 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 -reference=0 [/FRAME] [PACKET] codec_type=audio @@ -172,7 +170,6 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 -reference=0 [/FRAME] [PACKET] codec_type=video @@ -210,7 +207,6 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 -reference=0 [/FRAME] [PACKET] codec_type=audio @@ -310,7 +306,6 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 -reference=0 [/FRAME] [PACKET] codec_type=video @@ -348,7 +343,6 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 -reference=0 [/FRAME] [PACKET] codec_type=audio @@ -448,7 +442,6 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 -reference=0 [/FRAME] [PACKET] codec_type=video @@ -486,7 +479,6 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 -reference=0 [/FRAME] [STREAM] index=0 diff --git a/tests/ref/fate/ffprobe_flat b/tests/ref/fate/ffprobe_flat index b473c866f6..d62127ad43 100644 --- a/tests/ref/fate/ffprobe_flat +++ b/tests/ref/fate/ffprobe_flat @@ -58,7 +58,6 @@ packets_and_frames.frame.1.display_picture_number=0 packets_and_frames.frame.1.interlaced_frame=0 packets_and_frames.frame.1.top_field_first=0 packets_and_frames.frame.1.repeat_pict=0 -packets_and_frames.frame.1.reference=0 packets_and_frames.packet.2.codec_type="video" packets_and_frames.packet.2.stream_index=2 packets_and_frames.packet.2.pts=0 @@ -92,7 +91,6 @@ packets_and_frames.frame.2.display_picture_number=0 packets_and_frames.frame.2.interlaced_frame=0 packets_and_frames.frame.2.top_field_first=0 packets_and_frames.frame.2.repeat_pict=0 -packets_and_frames.frame.2.reference=0 packets_and_frames.packet.3.codec_type="audio" packets_and_frames.packet.3.stream_index=0 packets_and_frames.packet.3.pts=1024 @@ -153,7 +151,6 @@ packets_and_frames.frame.4.display_picture_number=0 packets_and_frames.frame.4.interlaced_frame=0 packets_and_frames.frame.4.top_field_first=0 packets_and_frames.frame.4.repeat_pict=0 -packets_and_frames.frame.4.reference=0 packets_and_frames.packet.5.codec_type="video" packets_and_frames.packet.5.stream_index=2 packets_and_frames.packet.5.pts=2048 @@ -187,7 +184,6 @@ packets_and_frames.frame.5.display_picture_number=0 packets_and_frames.frame.5.interlaced_frame=0 packets_and_frames.frame.5.top_field_first=0 packets_and_frames.frame.5.repeat_pict=0 -packets_and_frames.frame.5.reference=0 packets_and_frames.packet.6.codec_type="audio" packets_and_frames.packet.6.stream_index=0 packets_and_frames.packet.6.pts=2048 @@ -275,7 +271,6 @@ packets_and_frames.frame.8.display_picture_number=0 packets_and_frames.frame.8.interlaced_frame=0 packets_and_frames.frame.8.top_field_first=0 packets_and_frames.frame.8.repeat_pict=0 -packets_and_frames.frame.8.reference=0 packets_and_frames.packet.9.codec_type="video" packets_and_frames.packet.9.stream_index=2 packets_and_frames.packet.9.pts=4096 @@ -309,7 +304,6 @@ packets_and_frames.frame.9.display_picture_number=0 packets_and_frames.frame.9.interlaced_frame=0 packets_and_frames.frame.9.top_field_first=0 packets_and_frames.frame.9.repeat_pict=0 -packets_and_frames.frame.9.reference=0 packets_and_frames.packet.10.codec_type="audio" packets_and_frames.packet.10.stream_index=0 packets_and_frames.packet.10.pts=4096 @@ -397,7 +391,6 @@ packets_and_frames.frame.12.display_picture_number=0 packets_and_frames.frame.12.interlaced_frame=0 packets_and_frames.frame.12.top_field_first=0 packets_and_frames.frame.12.repeat_pict=0 -packets_and_frames.frame.12.reference=0 packets_and_frames.packet.13.codec_type="video" packets_and_frames.packet.13.stream_index=2 packets_and_frames.packet.13.pts=6144 @@ -431,7 +424,6 @@ packets_and_frames.frame.13.display_picture_number=0 packets_and_frames.frame.13.interlaced_frame=0 packets_and_frames.frame.13.top_field_first=0 packets_and_frames.frame.13.repeat_pict=0 -packets_and_frames.frame.13.reference=0 streams.stream.0.index=0 streams.stream.0.codec_name="pcm_s16le" streams.stream.0.profile="unknown" diff --git a/tests/ref/fate/ffprobe_ini b/tests/ref/fate/ffprobe_ini index 85349a52a9..476b1fe6d9 100644 --- a/tests/ref/fate/ffprobe_ini +++ b/tests/ref/fate/ffprobe_ini @@ -67,7 +67,6 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 -reference=0 [packets_and_frames.packet.2] codec_type=video @@ -105,7 +104,6 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 -reference=0 [packets_and_frames.packet.3] codec_type=audio @@ -174,7 +172,6 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 -reference=0 [packets_and_frames.packet.5] codec_type=video @@ -212,7 +209,6 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 -reference=0 [packets_and_frames.packet.6] codec_type=audio @@ -312,7 +308,6 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 -reference=0 [packets_and_frames.packet.9] codec_type=video @@ -350,7 +345,6 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 -reference=0 [packets_and_frames.packet.10] codec_type=audio @@ -450,7 +444,6 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 -reference=0 [packets_and_frames.packet.13] codec_type=video @@ -488,7 +481,6 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 -reference=0 [streams.stream.0] index=0 diff --git a/tests/ref/fate/ffprobe_json b/tests/ref/fate/ffprobe_json index 94e63fc0ae..393ef4620c 100644 --- a/tests/ref/fate/ffprobe_json +++ b/tests/ref/fate/ffprobe_json @@ -65,8 +65,7 @@ "display_picture_number": 0, "interlaced_frame": 0, "top_field_first": 0, - "repeat_pict": 0, - "reference": 0 + "repeat_pict": 0 }, { "type": "packet", @@ -102,8 +101,7 @@ "display_picture_number": 0, "interlaced_frame": 0, "top_field_first": 0, - "repeat_pict": 0, - "reference": 0 + "repeat_pict": 0 }, { "type": "packet", @@ -170,8 +168,7 @@ "display_picture_number": 0, "interlaced_frame": 0, "top_field_first": 0, - "repeat_pict": 0, - "reference": 0 + "repeat_pict": 0 }, { "type": "packet", @@ -207,8 +204,7 @@ "display_picture_number": 0, "interlaced_frame": 0, "top_field_first": 0, - "repeat_pict": 0, - "reference": 0 + "repeat_pict": 0 }, { "type": "packet", @@ -306,8 +302,7 @@ "display_picture_number": 0, "interlaced_frame": 0, "top_field_first": 0, - "repeat_pict": 0, - "reference": 0 + "repeat_pict": 0 }, { "type": "packet", @@ -343,8 +338,7 @@ "display_picture_number": 0, "interlaced_frame": 0, "top_field_first": 0, - "repeat_pict": 0, - "reference": 0 + "repeat_pict": 0 }, { "type": "packet", @@ -442,8 +436,7 @@ "display_picture_number": 0, "interlaced_frame": 0, "top_field_first": 0, - "repeat_pict": 0, - "reference": 0 + "repeat_pict": 0 }, { "type": "packet", @@ -479,8 +472,7 @@ "display_picture_number": 0, "interlaced_frame": 0, "top_field_first": 0, - "repeat_pict": 0, - "reference": 0 + "repeat_pict": 0 } ], "streams": [ diff --git a/tests/ref/fate/ffprobe_xml b/tests/ref/fate/ffprobe_xml index ac5ac861aa..8cec7adb1b 100644 --- a/tests/ref/fate/ffprobe_xml +++ b/tests/ref/fate/ffprobe_xml @@ -4,31 +4,31 @@ - + - + - + - + - + - + - + - +