From: Peter Harris <peter.harris@hummingbird.com>
Date: Wed, 27 Aug 2008 08:13:18 +0000 (+0200)
Subject: xv.xml: Make padding explicit
X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=56e3160f88f30e4f08433d5da826515575b75f09;p=free-sw%2Fxcb%2Fproto

xv.xml: Make padding explicit

I noticed that xv.xml assumes implicit padding in a couple of locations.
Please apply this patch to make the padding explicit. Or is implicit
pad support required in all consumers of xcb/proto?

Signed-off-by: Julien Danjou <julien@danjou.info>
---

diff --git a/src/xv.xml b/src/xv.xml
index ebf4837..e5a132f 100644
--- a/src/xv.xml
+++ b/src/xv.xml
@@ -84,11 +84,12 @@ authorization from the authors.
         <field type="CARD16" name="name_size" />
         <field type="CARD16" name="width" />
         <field type="CARD16" name="height" />
-        <field type="Rational" name="rate" />
         <!--
-        Xvproto.h has a padding CARD16 here but the name
-        overlaps.
+        Some versions of Xvproto.h incorrectly have
+        this padding after "rate".
         -->
+        <pad bytes="2" />
+        <field type="Rational" name="rate" />
         <list type="char" name="name">
             <fieldref>name_size</fieldref>
         </list>
@@ -97,6 +98,7 @@ authorization from the authors.
     <struct name="Format">
         <field type="VISUALID" name="visual" />
         <field type="CARD8" name="depth" />
+        <pad bytes="3" />
     </struct>
 
     <struct name="Image">