aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Rapp <t.rapp@noa-audio.com>2014-10-23 15:17:55 +0200
committerStefano Sabatini <stefasab@gmail.com>2014-10-30 12:34:49 +0100
commit0c9f0da0f7656059e9bd41931d250aafddf35ea3 (patch)
tree690d3991f5c8bcad02d4d6df98a4bf21d76b6402
parent792f0f20456cc24f1f1b9ee445e50737d65e38df (diff)
downloadffmpeg-0c9f0da0f7656059e9bd41931d250aafddf35ea3.tar.gz
ffprobe.xsd: add packets_and_frames element definition
This allows validation of ffprobe XML output if -show_packets and -show_frames are both set. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
-rw-r--r--doc/ffprobe.xsd11
1 files changed, 11 insertions, 0 deletions
diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd
index f4d679ead6..c2cab37134 100644
--- a/doc/ffprobe.xsd
+++ b/doc/ffprobe.xsd
@@ -13,6 +13,7 @@
<xsd:element name="pixel_formats" type="ffprobe:pixelFormatsType" minOccurs="0" maxOccurs="1" />
<xsd:element name="packets" type="ffprobe:packetsType" minOccurs="0" maxOccurs="1" />
<xsd:element name="frames" type="ffprobe:framesType" minOccurs="0" maxOccurs="1" />
+ <xsd:element name="packets_and_frames" type="ffprobe:packetsAndFramesType" minOccurs="0" maxOccurs="1" />
<xsd:element name="programs" type="ffprobe:programsType" minOccurs="0" maxOccurs="1" />
<xsd:element name="streams" type="ffprobe:streamsType" minOccurs="0" maxOccurs="1" />
<xsd:element name="chapters" type="ffprobe:chaptersType" minOccurs="0" maxOccurs="1" />
@@ -36,6 +37,16 @@
</xsd:sequence>
</xsd:complexType>
+ <xsd:complexType name="packetsAndFramesType">
+ <xsd:sequence>
+ <xsd:choice minOccurs="0" maxOccurs="unbounded">
+ <xsd:element name="packet" type="ffprobe:packetType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="frame" type="ffprobe:frameType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="subtitle" type="ffprobe:subtitleType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:choice>
+ </xsd:sequence>
+ </xsd:complexType>
+
<xsd:complexType name="packetType">
<xsd:attribute name="codec_type" type="xsd:string" use="required" />
<xsd:attribute name="stream_index" type="xsd:int" use="required" />