diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-15 09:03:52 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-15 09:03:52 +0100 |
| commit | 4d64875593956234795d9947ac1d225e5b110f0f (patch) | |
| tree | 5cc58965cdfe27a50f86f0d8872a7da80cc7248d /libxcb/xcb-proto/src/xv.xml | |
| parent | 9837797b353b2e24e7ac96d3a74159497410c21a (diff) | |
| parent | aa095d69b3874eb179cb77f033109a7f8f351041 (diff) | |
| download | vcxsrv-4d64875593956234795d9947ac1d225e5b110f0f.tar.gz vcxsrv-4d64875593956234795d9947ac1d225e5b110f0f.tar.bz2 vcxsrv-4d64875593956234795d9947ac1d225e5b110f0f.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xcb-proto mesa xserver git update 15 nov 2013
Conflicts:
xorg-server/mi/mieq.c
Diffstat (limited to 'libxcb/xcb-proto/src/xv.xml')
| -rw-r--r-- | libxcb/xcb-proto/src/xv.xml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libxcb/xcb-proto/src/xv.xml b/libxcb/xcb-proto/src/xv.xml index a05767c53..0b55d3633 100644 --- a/libxcb/xcb-proto/src/xv.xml +++ b/libxcb/xcb-proto/src/xv.xml @@ -112,10 +112,6 @@ authorization from the authors. <field type="CARD16" name="name_size" /> <field type="CARD16" name="width" /> <field type="CARD16" name="height" /> - <!-- - Some versions of Xvproto.h incorrectly have - this padding after "rate". - --> <pad bytes="2" /> <field type="Rational" name="rate" /> <list type="char" name="name"> @@ -234,10 +230,6 @@ authorization from the authors. <reply> <pad bytes="1" /> <field type="CARD16" name="num_encodings" /> - <!-- - In Xvproto.h this padding is 24 bytes - in actuality it is 22 bytes - --> <pad bytes="22" /> <list type="EncodingInfo" name="info"> <fieldref>num_encodings</fieldref> |