[FFmpeg-devel] [PATCH] doc/ffprobe.xsd fixes for order and missing elements/attributes

[Dave Rice]

On Jul 1, 2014, at 9:32 PM, Michael Niedermayer <michaelni at gmx.at> wrote:

> On Tue, Jul 01, 2014 at 09:29:46PM -0400, Dave Rice wrote:
> [...]
>>> Please create a patch with git-format, complete with author
>>> info. Patch itself looks good.
>> 
>> Attached,
> 
> seems to have fallen off, retry with more duct tape please
> 
> [...]

From 6408a1b7b443e7f73aab5276cd67bd1e7615d464 Mon Sep 17 00:00:00 2001
From: Dave Rice <dave at dericed.com>
Date: Tue, 1 Jul 2014 21:22:41 -0400
Subject: [PATCH] doc/ffprobe.xsd: fix order and missing elements/attributes

Signed-off-by: Dave Rice <dave at dericed.com>
---
 doc/ffprobe.xsd | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd
index ad19900..9ef9ecb 100644
--- a/doc/ffprobe.xsd
+++ b/doc/ffprobe.xsd
@@ -8,15 +8,15 @@
 
     <xsd:complexType name="ffprobeType">
         <xsd:sequence>
+            <xsd:element name="program_version"  type="ffprobe:programVersionType"  minOccurs="0" maxOccurs="1" />
+            <xsd:element name="library_versions" type="ffprobe:libraryVersionsType" 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="streams"  type="ffprobe:streamsType" 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" />
             <xsd:element name="format"   type="ffprobe:formatType"  minOccurs="0" maxOccurs="1" />
             <xsd:element name="error"    type="ffprobe:errorType"   minOccurs="0" maxOccurs="1" />
-            <xsd:element name="program_version"  type="ffprobe:programVersionType"  minOccurs="0" maxOccurs="1" />
-            <xsd:element name="library_versions" type="ffprobe:libraryVersionsType" minOccurs="0" maxOccurs="1" />
         </xsd:sequence>
     </xsd:complexType>
 
@@ -53,6 +53,10 @@
     </xsd:complexType>
 
     <xsd:complexType name="frameType">
+      <xsd:sequence>
+            <xsd:element name="tag" type="ffprobe:tagType" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+
       <xsd:attribute name="media_type"    type="xsd:string" use="required"/>
       <xsd:attribute name="key_frame"     type="xsd:int"    use="required"/>
       <xsd:attribute name="pts"           type="xsd:long" />
@@ -222,8 +226,7 @@
       <xsd:attribute name="copyright"        type="xsd:string" use="required"/>
       <xsd:attribute name="build_date"       type="xsd:string" use="required"/>
       <xsd:attribute name="build_time"       type="xsd:string" use="required"/>
-      <xsd:attribute name="compiler_type"    type="xsd:string" use="required"/>
-      <xsd:attribute name="compiler_version" type="xsd:string" use="required"/>
+      <xsd:attribute name="compiler_ident"   type="xsd:string" use="required"/>
       <xsd:attribute name="configuration"    type="xsd:string" use="required"/>
     </xsd:complexType>
 
-- 
2.0.0