virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

ffprobe: fix validity error with tags and data.

Browse Source 
Add "data" and "extradata" attributes to the schema.
Add "tag" element in "streams".
Print extradata before tags to avoid closing the element.

Fix trac ticket #1588.
This commit is contained in:
Nicolas George
2012-07-31 11:53:30 +02:00
parent 52bd9cb4d2
commit 89898cd3b6
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/ffprobe.xsd
View File

@@ -44,6 +44,7 @@
<xsd:attribute name="size" type="xsd:long" use="required" /> <xsd:attribute name="size" type="xsd:long" use="required" />
<xsd:attribute name="pos" type="xsd:long" /> <xsd:attribute name="pos" type="xsd:long" />
<xsd:attribute name="flags" type="xsd:string" use="required" /> <xsd:attribute name="flags" type="xsd:string" use="required" />
<xsd:attribute name="data" type="xsd:string" />
</xsd:complexType> </xsd:complexType>
<xsd:complexType name="frameType"> <xsd:complexType name="frameType">
@@ -86,6 +87,10 @@
</xsd:complexType> </xsd:complexType>
<xsd:complexType name="streamType"> <xsd:complexType name="streamType">
<xsd:sequence>
<xsd:element name="tag" type="ffprobe:tagType" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attribute name="index" type="xsd:int" use="required"/> <xsd:attribute name="index" type="xsd:int" use="required"/>
<xsd:attribute name="codec_name" type="xsd:string" /> <xsd:attribute name="codec_name" type="xsd:string" />
<xsd:attribute name="codec_long_name" type="xsd:string" /> <xsd:attribute name="codec_long_name" type="xsd:string" />
@@ -94,6 +99,7 @@
<xsd:attribute name="codec_time_base" type="xsd:string" use="required"/> <xsd:attribute name="codec_time_base" type="xsd:string" use="required"/>
<xsd:attribute name="codec_tag" type="xsd:string" use="required"/> <xsd:attribute name="codec_tag" type="xsd:string" use="required"/>
<xsd:attribute name="codec_tag_string" type="xsd:string" use="required"/> <xsd:attribute name="codec_tag_string" type="xsd:string" use="required"/>
<xsd:attribute name="extradata" type="xsd:string" />
<!-- video attributes --> <!-- video attributes -->
<xsd:attribute name="width" type="xsd:int"/> <xsd:attribute name="width" type="xsd:int"/>

2
ffprobe.c
View File

@@ -1844,10 +1844,10 @@ static void show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_i
else print_str_opt("nb_read_frames", "N/A"); else print_str_opt("nb_read_frames", "N/A");
if (nb_streams_packets[stream_idx]) print_fmt ("nb_read_packets", "%"PRIu64, nb_streams_packets[stream_idx]); if (nb_streams_packets[stream_idx]) print_fmt ("nb_read_packets", "%"PRIu64, nb_streams_packets[stream_idx]);
else print_str_opt("nb_read_packets", "N/A"); else print_str_opt("nb_read_packets", "N/A");
show_tags(stream->metadata);
if (do_show_data) if (do_show_data)
writer_print_data(w, "extradata", dec_ctx->extradata, writer_print_data(w, "extradata", dec_ctx->extradata,
dec_ctx->extradata_size); dec_ctx->extradata_size);
show_tags(stream->metadata);
print_section_footer("stream"); print_section_footer("stream");
av_bprint_finalize(&pbuf, NULL); av_bprint_finalize(&pbuf, NULL);