[Libva] [PATCH libva-intel-driver 1/6] Define i965_DestroySurfaces in header file explicitly to avoid multiple declaration

[yakui.zhao at intel.com]

From: Zhao Yakui <yakui.zhao at intel.com>

Signed-off-by: Zhao Yakui <yakui.zhao at intel.com>
---
 src/gen75_mfd.c            | 4 ----
 src/gen75_vpp_gpe.c        | 5 -----
 src/gen75_vpp_vebox.c      | 4 ----
 src/gen7_mfd.c             | 4 ----
 src/gen8_mfd.c             | 4 ----
 src/i965_drv_video.h       | 4 ++++
 src/i965_encoder.c         | 4 ----
 src/i965_post_processing.c | 4 ----
 src/i965_render.c          | 7 -------
 9 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/src/gen75_mfd.c b/src/gen75_mfd.c
index 4a4de0b..7bea1f7 100644
--- a/src/gen75_mfd.c
+++ b/src/gen75_mfd.c
@@ -2467,10 +2467,6 @@ gen75_mfd_jpeg_bsd_object(VADriverContextP ctx,
 /* Workaround for JPEG decoding on Ivybridge */
 
 VAStatus 
-i965_DestroySurfaces(VADriverContextP ctx,
-                     VASurfaceID *surface_list,
-                     int num_surfaces);
-VAStatus 
 i965_CreateSurfaces(VADriverContextP ctx,
                     int width,
                     int height,
diff --git a/src/gen75_vpp_gpe.c b/src/gen75_vpp_gpe.c
index 791ee3d..9cb2912 100644
--- a/src/gen75_vpp_gpe.c
+++ b/src/gen75_vpp_gpe.c
@@ -59,11 +59,6 @@ i965_CreateSurfaces(VADriverContextP ctx,
                     int num_surfaces,
                     VASurfaceID *surfaces);
 
-extern VAStatus 
-i965_DestroySurfaces(VADriverContextP ctx,
-                     VASurfaceID *surface_list,
-                     int num_surfaces);
-
 /* Shaders information for sharpening */
 static const unsigned int gen75_gpe_sharpening_h_blur[][4] = {
    #include "shaders/post_processing/gen75/sharpening_h_blur.g75b"
diff --git a/src/gen75_vpp_vebox.c b/src/gen75_vpp_vebox.c
index 160560e..20fb44a 100644
--- a/src/gen75_vpp_vebox.c
+++ b/src/gen75_vpp_vebox.c
@@ -53,10 +53,6 @@ i965_DeriveImage(VADriverContextP ctx, VABufferID surface, VAImage *out_image);
 extern VAStatus
 i965_DestroyImage(VADriverContextP ctx, VAImageID image);
 
-extern VAStatus
-i965_DestroySurfaces(VADriverContextP ctx,
-                     VASurfaceID *surface_list,
-                     int num_surfaces);
 
 extern VAStatus
 i965_CreateSurfaces(VADriverContextP ctx,
diff --git a/src/gen7_mfd.c b/src/gen7_mfd.c
index 5091034..a534fb8 100755
--- a/src/gen7_mfd.c
+++ b/src/gen7_mfd.c
@@ -2092,10 +2092,6 @@ gen7_mfd_jpeg_bsd_object(VADriverContextP ctx,
 /* Workaround for JPEG decoding on Ivybridge */
 
 VAStatus 
-i965_DestroySurfaces(VADriverContextP ctx,
-                     VASurfaceID *surface_list,
-                     int num_surfaces);
-VAStatus 
 i965_CreateSurfaces(VADriverContextP ctx,
                     int width,
                     int height,
diff --git a/src/gen8_mfd.c b/src/gen8_mfd.c
index a801a7c..08d9b3d 100644
--- a/src/gen8_mfd.c
+++ b/src/gen8_mfd.c
@@ -2181,10 +2181,6 @@ gen8_mfd_jpeg_bsd_object(VADriverContextP ctx,
 #ifdef JPEG_WA
 
 VAStatus 
-i965_DestroySurfaces(VADriverContextP ctx,
-                     VASurfaceID *surface_list,
-                     int num_surfaces);
-VAStatus 
 i965_CreateSurfaces(VADriverContextP ctx,
                     int width,
                     int height,
diff --git a/src/i965_drv_video.h b/src/i965_drv_video.h
index 69c625b..1b2f166 100644
--- a/src/i965_drv_video.h
+++ b/src/i965_drv_video.h
@@ -414,6 +414,10 @@ extern VAStatus i965_MapBuffer(VADriverContextP ctx,
 
 extern VAStatus i965_UnmapBuffer(VADriverContextP ctx, VABufferID buf_id);
 
+extern VAStatus i965_DestroySurfaces(VADriverContextP ctx,
+                     VASurfaceID *surface_list,
+                     int num_surfaces);
+
 #define I965_SURFACE_MEM_NATIVE             0
 #define I965_SURFACE_MEM_GEM_FLINK          1
 #define I965_SURFACE_MEM_DRM_PRIME          2
diff --git a/src/i965_encoder.c b/src/i965_encoder.c
index 16e64db..897c60d 100644
--- a/src/i965_encoder.c
+++ b/src/i965_encoder.c
@@ -45,10 +45,6 @@ extern Bool gen6_vme_context_init(VADriverContextP ctx, struct intel_encoder_con
 extern Bool gen7_mfc_context_init(VADriverContextP ctx, struct intel_encoder_context *encoder_context);
 
 VAStatus 
-i965_DestroySurfaces(VADriverContextP ctx,
-                     VASurfaceID *surface_list,
-                     int num_surfaces);
-VAStatus 
 i965_CreateSurfaces(VADriverContextP ctx,
                     int width,
                     int height,
diff --git a/src/i965_post_processing.c b/src/i965_post_processing.c
index bbd1426..2581d2a 100755
--- a/src/i965_post_processing.c
+++ b/src/i965_post_processing.c
@@ -61,10 +61,6 @@
 #define VA_STATUS_SUCCESS_1                     0xFFFFFFFE
 
 extern VAStatus
-i965_DestroySurfaces(VADriverContextP ctx,
-                     VASurfaceID *surface_list,
-                     int num_surfaces);
-extern VAStatus
 i965_CreateSurfaces(VADriverContextP ctx,
                     int width,
                     int height,
diff --git a/src/i965_render.c b/src/i965_render.c
index b3a844f..ff15a38 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -4423,13 +4423,6 @@ gen8_render_put_subpicture(
     intel_batchbuffer_flush(batch);
 }
 
-/*
- * global functions
- */
-VAStatus 
-i965_DestroySurfaces(VADriverContextP ctx,
-                     VASurfaceID *surface_list,
-                     int num_surfaces);
 void
 intel_render_put_surface(
     VADriverContextP   ctx,
-- 
1.8.2-rc2