summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2013-06-09 19:00:29 +0200
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-06-21 18:21:43 -0700
commitd97051236bba088688681f348086feb733cbdd08 (patch)
treeab4ae5f06b992da715166a58c54c4d69cda42105
parente42cf822e230cff5c6550ca2c050dfa27d2c9611 (diff)
Xvproto: fix xvEncodingInfo to match actual wire protocol
The padding is *before* the rate field, so the rate is placed on a 32bit boundary. This change adds explicit padding between height and rate, and removes extraneous padding after the rate field, which the server never sent and xlib never read. This changes sizeof(xvEncodingInfo). Hopefully that's not a big deal as clients only see the Xlib structure XvEncodingInfo. Debian bug#657215 Reported-by: Kevin Ryde <user42@zip.com.au> Signed-off-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--Xvproto.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Xvproto.h b/Xvproto.h
index b6b56cf..926df06 100644
--- a/Xvproto.h
+++ b/Xvproto.h
@@ -84,8 +84,8 @@ typedef struct {
XvEncodingID encoding B32;
CARD16 name_size B16;
CARD16 width B16, height B16;
- xvRational rate;
CARD16 pad B16;
+ xvRational rate;
} xvEncodingInfo;
#define sz_xvEncodingInfo (12 + sz_xvRational)