ffmpeg | branch: master | Tobias Rapp <t.r...@noa-audio.com> | Thu Oct 23 15:17:55 2014 +0200| [0c9f0da0f7656059e9bd41931d250aafddf35ea3] | committer: Stefano Sabatini
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 <stefa...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0c9f0da0f7656059e9bd41931d250aafddf35ea3 --- doc/ffprobe.xsd | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd index f4d679e..c2cab37 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" /> _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
