videoproto: Changes to 'master'

[Alan Coopersmith]

 Xvproto.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d97051236bba088688681f348086feb733cbdd08
Author: Julien Cristau <jcristau at debian.org>
Date:   Sun Jun 9 19:00:29 2013 +0200

    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 at zip.com.au>
    Signed-off-by: Julien Cristau <jcristau at debian.org>
    Reviewed-by: Daniel Martin <consume.noise at gmail.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>