From d97051236bba088688681f348086feb733cbdd08 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Sun, 9 Jun 2013 19:00:29 +0200
Subject: 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>
---
 Xvproto.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Xvproto.h')

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)
 
-- 
cgit v1.2.1