diff mbox series

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

Message ID 1617185604-18044-2-git-send-email-t.rapp@noa-archive.com
State Accepted
Commit 39eafd0b2e1c5666029390ac57f3fe5441d8fc7e
Headers show
Series [FFmpeg-devel,1/2] fftools/ffprobe: Remove check on show_frames and show_packets in XML writer | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Tobias Rapp March 31, 2021, 10:13 a.m. UTC 
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@noa-archive.com>
---
 doc/ffprobe.xsd | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)
diff mbox series

Patch

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">