From: Thomas Balling Sørensen <tball@tball-laptop.(none)>
Date: Wed, 27 Oct 2010 18:27:11 +0000 (+0200)
Subject: vl: morefixes to Luc's patch
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6b6310e67ce1d2c5729d91c704302282998ed35e;p=mesa.git

vl: morefixes to Luc's patch
---

diff --git a/src/gallium/state_trackers/va/ftab.c b/src/gallium/state_trackers/va/ftab.c
index 010c04a7d28..a567eee9dd1 100644
--- a/src/gallium/state_trackers/va/ftab.c
+++ b/src/gallium/state_trackers/va/ftab.c
@@ -47,7 +47,7 @@ static struct VADriverVTable vtable =
 	&vlVaBufferSetNumElements, /* VAStatus (*vaBufferSetNumElements) (VADriverContextP ctx,VABufferID buf_id,unsigned int num_elements); */
 	&vlVaMapBuffer, /* VAStatus (*vaMapBuffer) (VADriverContextP ctx,VABufferID buf_id,void **pbuf); */
 	&vlVaUnmapBuffer, /* VAStatus (*vaUnmapBuffer) (VADriverContextP ctx,VABufferID buf_id); */
-	&vlVaDestroyBuffers, /* VAStatus (*vaDestroyBuffer) (VADriverContextP ctx,VABufferID buffer_id); */
+	&vlVaDestroyBuffer, /* VAStatus (*vaDestroyBuffer) (VADriverContextP ctx,VABufferID buffer_id); */
 	&vlVaBeginPicture, /* VAStatus (*vaBeginPicture) (VADriverContextP ctx,VAContextID context,VASurfaceID render_target); */
 	&vlVaRenderPicture, /* VAStatus (*vaRenderPicture) (VADriverContextP ctx,VAContextID context,VABufferID *buffers,int num_buffers); */
 	&vlVaEndPicture, /* VAStatus (*vaEndPicture) (VADriverContextP ctx,VAContextID context); */
diff --git a/src/gallium/state_trackers/va/va_buffer.c b/src/gallium/state_trackers/va/va_buffer.c
index 19afd7b2a30..7608a4264ff 100644
--- a/src/gallium/state_trackers/va/va_buffer.c
+++ b/src/gallium/state_trackers/va/va_buffer.c
@@ -73,7 +73,7 @@ VAStatus vlVaUnmapBuffer(		VADriverContextP ctx,
 	return VA_STATUS_ERROR_UNIMPLEMENTED;
 }
 
-VAStatus vlVaDestroyBuffers(		VADriverContextP ctx,
+VAStatus vlVaDestroyBuffer(		VADriverContextP ctx,
                                     VABufferID buffer_id)
 {
 	if (!ctx)
diff --git a/src/gallium/state_trackers/va/va_surface.c b/src/gallium/state_trackers/va/va_surface.c
index 7d234bd51b4..314aa7c3d96 100644
--- a/src/gallium/state_trackers/va/va_surface.c
+++ b/src/gallium/state_trackers/va/va_surface.c
@@ -33,7 +33,7 @@ VAStatus vlVaCreateSurfaces(       VADriverContextP ctx,
                                                         int width,
                                                         int height,
                                                         int format,
-                                                        int num_surfaces
+                                                        int num_surfaces,
                                                         VASurfaceID *surfaces)
 {
         if (!ctx)
@@ -53,6 +53,7 @@ VAStatus vlVaDestroySurfaces(       VADriverContextP ctx,
 
 VAStatus vlVaSyncSurface(       VADriverContextP ctx,
                                                         VASurfaceID render_target)
+{
         if (!ctx)
                 return VA_STATUS_ERROR_INVALID_CONTEXT;
 
@@ -70,7 +71,6 @@ VAStatus vlVaQuerySurfaceStatus(       VADriverContextP ctx,
 }
 
 VAStatus vlVaPutSurface(       VADriverContextP ctx,
-                                                        VADriverContextP ctx,
                                                         VASurfaceID surface,
                                                         void* draw,
                                                         short srcx,