From 48416b6f4d3ffa46168b8b4a46a262562cd7473a Mon Sep 17 00:00:00 2001 From: "Juan A. Suarez Romero" Date: Fri, 2 Dec 2016 16:26:51 +0000 Subject: [PATCH] st/va: declare vlVaBuffer before vlVaContext And declare coded_buf in vlVaContext as "vlVaBuffer *" instead of "struct vlVaBuffer *". This fixes several warnings later about assignment from incompatible pointer type. Reviewed-by: Emil Velikov --- src/gallium/state_trackers/va/va_private.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/gallium/state_trackers/va/va_private.h b/src/gallium/state_trackers/va/va_private.h index 900abbc5904..8faec106ea2 100644 --- a/src/gallium/state_trackers/va/va_private.h +++ b/src/gallium/state_trackers/va/va_private.h @@ -221,6 +221,20 @@ typedef struct { } vlVaSubpicture; typedef struct { + VABufferType type; + unsigned int size; + unsigned int num_elements; + void *data; + struct { + struct pipe_resource *resource; + struct pipe_transfer *transfer; + } derived_surface; + unsigned int export_refcount; + VABufferInfo export_state; + unsigned int coded_size; +} vlVaBuffer; + +typedef struct { struct pipe_video_codec templat, *decoder; struct pipe_video_buffer *target; union { @@ -243,7 +257,7 @@ typedef struct { } mpeg4; struct vl_deint_filter *deint; - struct vlVaBuffer *coded_buf; + vlVaBuffer *coded_buf; int target_id; bool first_single_submitted; int gop_coeff; @@ -257,20 +271,6 @@ typedef struct { } vlVaConfig; typedef struct { - VABufferType type; - unsigned int size; - unsigned int num_elements; - void *data; - struct { - struct pipe_resource *resource; - struct pipe_transfer *transfer; - } derived_surface; - unsigned int export_refcount; - VABufferInfo export_state; - unsigned int coded_size; -} vlVaBuffer; - -typedef struct { struct pipe_video_buffer templat, *buffer; struct util_dynarray subpics; /* vlVaSubpicture */ VAContextID ctx; -- 2.11.0