diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-01 12:53:24 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-01 12:53:24 +0200 |
commit | d7f917c37af24eec2720231db03ab41469550855 (patch) | |
tree | 8172105487a4d15d089eebebff3f66cf7d9cf6a0 /tests/ref | |
parent | 291ad12ea2d1f9297d4ed22d54f4f8fa232e43dc (diff) | |
download | ffmpeg-d7f917c37af24eec2720231db03ab41469550855.tar.gz |
fate: update fate tests after master:291ad12ea2d1: ffprobe: show probe_score in the format section
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref')
-rw-r--r-- | tests/ref/fate/ffprobe_compact | 2 | ||||
-rw-r--r-- | tests/ref/fate/ffprobe_csv | 2 | ||||
-rw-r--r-- | tests/ref/fate/ffprobe_default | 1 | ||||
-rw-r--r-- | tests/ref/fate/ffprobe_flat | 1 | ||||
-rw-r--r-- | tests/ref/fate/ffprobe_ini | 1 | ||||
-rw-r--r-- | tests/ref/fate/ffprobe_json | 1 | ||||
-rw-r--r-- | tests/ref/fate/ffprobe_xml | 2 |
7 files changed, 7 insertions, 3 deletions
diff --git a/tests/ref/fate/ffprobe_compact b/tests/ref/fate/ffprobe_compact index 04d8ce42c5..249df5750d 100644 --- a/tests/ref/fate/ffprobe_compact +++ b/tests/ref/fate/ffprobe_compact @@ -29,4 +29,4 @@ frame|media_type=video|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=61 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=N/A|duration=N/A|bit_rate=705600|nb_frames=N/A|nb_read_frames=6|nb_read_packets=6|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|tag:E=mc² stream|index=1|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/51200|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=320|height=240|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=4:3|pix_fmt=rgb24|level=-99|timecode=N/A|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|tag:title=foobar|tag:duration_ts=field-and-tags-conflict-attempt stream|index=2|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/51200|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=100|height=100|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=1:1|pix_fmt=rgb24|level=-99|timecode=N/A|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0 -format|filename=tests/data/ffprobe-test.nut|nb_streams=3|nb_programs=0|format_name=nut|start_time=0.000000|duration=0.120000|size=1054812|bit_rate=70320800|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=1054812|bit_rate=70320800|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 a11b321b6f..4d950c343e 100644 --- a/tests/ref/fate/ffprobe_csv +++ b/tests/ref/fate/ffprobe_csv @@ -29,4 +29,4 @@ frame,video,1,6144,0.120000,6144,0.120000,2048,0.040000,1024731,N/A,100,100,rgb2 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,N/A,N/A,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,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 stream,2,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,100,100,0,1:1,1:1,rgb24,-99,N/A,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0 -format,tests/data/ffprobe-test.nut,3,0,nut,0.000000,0.120000,1054812,70320800,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,1054812,70320800,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 f56bd8d4a3..690a419b0d 100644 --- a/tests/ref/fate/ffprobe_default +++ b/tests/ref/fate/ffprobe_default @@ -608,6 +608,7 @@ start_time=0.000000 duration=0.120000 size=1054812 bit_rate=70320800 +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_flat b/tests/ref/fate/ffprobe_flat index 7cb9c3ef69..e54510fa5b 100644 --- a/tests/ref/fate/ffprobe_flat +++ b/tests/ref/fate/ffprobe_flat @@ -545,6 +545,7 @@ format.start_time="0.000000" format.duration="0.120000" format.size="1054812" format.bit_rate="70320800" +format.probe_score=100 format.tags.title="ffprobe test file" format.tags.comment="'A comment with CSV, XML & JSON special chars': <tag value=\"x\">" format.tags.comment2="I ♥ Üñîçød€" diff --git a/tests/ref/fate/ffprobe_ini b/tests/ref/fate/ffprobe_ini index c0254dc71a..8f4de86090 100644 --- a/tests/ref/fate/ffprobe_ini +++ b/tests/ref/fate/ffprobe_ini @@ -620,6 +620,7 @@ start_time=0.000000 duration=0.120000 size=1054812 bit_rate=70320800 +probe_score=100 [format.tags] title=ffprobe test file diff --git a/tests/ref/fate/ffprobe_json b/tests/ref/fate/ffprobe_json index ee5ddb95b7..f0bdb19714 100644 --- a/tests/ref/fate/ffprobe_json +++ b/tests/ref/fate/ffprobe_json @@ -590,6 +590,7 @@ "duration": "0.120000", "size": "1054812", "bit_rate": "70320800", + "probe_score": 100, "tags": { "title": "ffprobe test file", "comment": "'A comment with CSV, XML & JSON special chars': <tag value=\"x\">", diff --git a/tests/ref/fate/ffprobe_xml b/tests/ref/fate/ffprobe_xml index 410f250cb0..0abca38e82 100644 --- a/tests/ref/fate/ffprobe_xml +++ b/tests/ref/fate/ffprobe_xml @@ -46,7 +46,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="1054812" bit_rate="70320800"> + <format filename="tests/data/ffprobe-test.nut" nb_streams="3" nb_programs="0" format_name="nut" start_time="0.000000" duration="0.120000" size="1054812" bit_rate="70320800" 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€"/> |