diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-08 23:43:40 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-08 23:58:18 +0100 |
commit | fa14685a578d4d37f9a53c2399bba7770e48f747 (patch) | |
tree | 7b748d69f420ba6b2fd8a62433b194addf60d1ad /tests/ref/fate/ffprobe_xml | |
parent | d5e9fc782150d4596c72440a0aa02b7f4f1254b1 (diff) | |
parent | 7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f (diff) | |
download | ffmpeg-streaming-fa14685a578d4d37f9a53c2399bba7770e48f747.zip ffmpeg-streaming-fa14685a578d4d37f9a53c2399bba7770e48f747.tar.gz |
Merge commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f'
* commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f':
avprobe: Export coded_{width,height} in -show_streams
Conflicts:
avprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/ffprobe_xml')
-rw-r--r-- | tests/ref/fate/ffprobe_xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/ref/fate/ffprobe_xml b/tests/ref/fate/ffprobe_xml index 2dcdc97..5dad3e7 100644 --- a/tests/ref/fate/ffprobe_xml +++ b/tests/ref/fate/ffprobe_xml @@ -37,13 +37,13 @@ <tag key="E" value="mc²"/> <tag key="encoder" value="Lavc pcm_s16le"/> </stream> - <stream index="1" codec_name="rawvideo" codec_type="video" codec_time_base="1/51200" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="320" height="240" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="4:3" pix_fmt="rgb24" level="-99" refs="1" r_frame_rate="25/1" avg_frame_rate="25/1" time_base="1/51200" start_pts="0" start_time="0.000000" nb_read_frames="4" nb_read_packets="4"> + <stream index="1" codec_name="rawvideo" codec_type="video" codec_time_base="1/51200" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="320" height="240" 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" refs="1" r_frame_rate="25/1" avg_frame_rate="25/1" time_base="1/51200" start_pts="0" start_time="0.000000" nb_read_frames="4" nb_read_packets="4"> <disposition default="0" dub="0" original="0" comment="0" lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0" clean_effects="0" attached_pic="0"/> <tag key="title" value="foobar"/> <tag key="duration_ts" value="field-and-tags-conflict-attempt"/> <tag key="encoder" value="Lavc rawvideo"/> </stream> - <stream index="2" codec_name="rawvideo" codec_type="video" codec_time_base="1/51200" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="100" height="100" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="1:1" pix_fmt="rgb24" level="-99" refs="1" r_frame_rate="25/1" avg_frame_rate="25/1" time_base="1/51200" start_pts="0" start_time="0.000000" nb_read_frames="4" nb_read_packets="4"> + <stream index="2" codec_name="rawvideo" codec_type="video" codec_time_base="1/51200" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="100" height="100" 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" refs="1" r_frame_rate="25/1" avg_frame_rate="25/1" time_base="1/51200" start_pts="0" start_time="0.000000" nb_read_frames="4" nb_read_packets="4"> <disposition default="0" dub="0" original="0" comment="0" lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0" clean_effects="0" attached_pic="0"/> <tag key="encoder" value="Lavc rawvideo"/> </stream> |