[FFmpeg-cvslog] doc/ffprobe.xsd: Clean-up choice indicator definitions

Tobias Rapp git at videolan.org
Fri Apr 16 10:15:21 EEST 2021


ffmpeg | branch: master | Tobias Rapp <t.rapp at noa-archive.com> | Wed Mar 31 11:47:18 2021 +0200| [39eafd0b2e1c5666029390ac57f3fe5441d8fc7e] | committer: Tobias Rapp

doc/ffprobe.xsd: Clean-up choice indicator definitions

Remove the unneeded wrapping sequence element. Also the
minOccurs/maxOccurs occurrence indicators on the inner element
definitions can be removed.

Signed-off-by: Tobias Rapp <t.rapp at noa-archive.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=39eafd0b2e1c5666029390ac57f3fe5441d8fc7e
---

 doc/ffprobe.xsd | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd
index a9ffe57f16..250de8cd5c 100644
--- a/doc/ffprobe.xsd
+++ b/doc/ffprobe.xsd
@@ -29,22 +29,18 @@
     </xsd:complexType>
 
     <xsd:complexType name="framesType">
-        <xsd:sequence>
-            <xsd:choice 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:choice minOccurs="0" maxOccurs="unbounded">
+            <xsd:element name="frame"    type="ffprobe:frameType"/>
+            <xsd:element name="subtitle" type="ffprobe:subtitleType"/>
+        </xsd:choice>
     </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:choice minOccurs="0" maxOccurs="unbounded">
+            <xsd:element name="packet"   type="ffprobe:packetType"/>
+            <xsd:element name="frame"    type="ffprobe:frameType"/>
+            <xsd:element name="subtitle" type="ffprobe:subtitleType"/>
+        </xsd:choice>
     </xsd:complexType>
 
     <xsd:complexType name="packetType">



More information about the ffmpeg-cvslog mailing list