[FFmpeg-devel] [PATCH 2/2] doc/ffprobe.xsd: Clean-up choice indicator definitions

Tobias Rapp t.rapp at noa-archive.com
Wed Mar 31 13:13:24 EEST 2021


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

Signed-off-by: Tobias Rapp <t.rapp at noa-archive.com>
---
 doc/ffprobe.xsd | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd
index a9ffe57..250de8c 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">
-- 
2.7.4




More information about the ffmpeg-devel mailing list