diff options
| -rw-r--r-- | doc/ffprobe.xsd | 6 | ||||
| -rw-r--r-- | ffprobe.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd index 13c0d02ae3..4340d462e1 100644 --- a/doc/ffprobe.xsd +++ b/doc/ffprobe.xsd @@ -44,6 +44,7 @@ <xsd:attribute name="size" type="xsd:long" use="required" /> <xsd:attribute name="pos" type="xsd:long" /> <xsd:attribute name="flags" type="xsd:string" use="required" /> + <xsd:attribute name="data" type="xsd:string" /> </xsd:complexType> <xsd:complexType name="frameType"> @@ -86,6 +87,10 @@ </xsd:complexType> <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="codec_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_tag" 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 --> <xsd:attribute name="width" type="xsd:int"/> @@ -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"); 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"); - show_tags(stream->metadata); if (do_show_data) writer_print_data(w, "extradata", dec_ctx->extradata, dec_ctx->extradata_size); + show_tags(stream->metadata); print_section_footer("stream"); av_bprint_finalize(&pbuf, NULL); |