Fix compiler warnings.

7 files changed, 20 insertions, 10 deletions

diff --git a/src/vdpau_buffer.c b/src/vdpau_buffer.c
index c42be24..2f3ca75 100644
--- a/src/vdpau_buffer.c
+++ b/src/vdpau_buffer.c
@@ -94,7 +94,7 @@ schedule_destroy_va_buffer(
         return;
 
     realloc_buffer(
-        &obj_context->dead_buffers,
+        (void **)&obj_context->dead_buffers,
         &obj_context->dead_buffers_count_max,
         16 + obj_context->dead_buffers_count,
         sizeof(*obj_context->dead_buffers)
diff --git a/src/vdpau_decode.c b/src/vdpau_decode.c
index 0340c13..08dfbf0 100644
--- a/src/vdpau_decode.c
+++ b/src/vdpau_decode.c
@@ -232,7 +232,7 @@ alloc_VdpBitstreamBuffer(object_context_p obj_context)
     VdpBitstreamBuffer *vdp_bitstream_buffers;
 
     vdp_bitstream_buffers = realloc_buffer(
-        &obj_context->vdp_bitstream_buffers,
+        (void **)&obj_context->vdp_bitstream_buffers,
         &obj_context->vdp_bitstream_buffers_count_max,
         1 + obj_context->vdp_bitstream_buffers_count,
         sizeof(*obj_context->vdp_bitstream_buffers)
diff --git a/src/vdpau_dump.c b/src/vdpau_dump.c
index f4e5321..9535ddc 100644
--- a/src/vdpau_dump.c
+++ b/src/vdpau_dump.c
@@ -62,6 +62,14 @@ const char *string_of_VABufferType(VABufferType type)
         _(VAEncH264VUIBufferType);
         _(VAEncH264SEIBufferType);
 #endif
+#if VA_CHECK_VERSION(0,31,1)
+        _(VAQMatrixBufferType);
+#endif
+#if VA_CHECK_VERSION(0,32,0)
+        _(VAEncMiscParameterBufferType);
+#endif
+    default:
+        break;
 #undef _
     }
     return str;
@@ -103,7 +111,7 @@ const char *string_of_VdpCodec(VdpCodec codec)
 
 // Dumps matrix[N][M] = N rows x M columns (uint8_t)
 static void
-dump_matrix_NxM(const char *label, uint8_t *matrix, int N, int M, int L)
+dump_matrix_NxM(const char *label, const uint8_t *matrix, int N, int M, int L)
 {
     int i, j, n = 0;
 
diff --git a/src/vdpau_gate.c b/src/vdpau_gate.c
index 8b6a786..db6140b 100644
--- a/src/vdpau_gate.c
+++ b/src/vdpau_gate.c
@@ -398,7 +398,7 @@ vdpau_output_surface_put_bits_indexed(
     return VDPAU_INVOKE(output_surface_put_bits_indexed,
                         surface,
                         source_indexed_format,
-                        source_data,
+                        (const void **)source_data,
                         source_pitch,
                         destination_rect,
                         color_table_format,
diff --git a/src/vdpau_subpic.c b/src/vdpau_subpic.c
index eccaecb..3e6dc4c 100644
--- a/src/vdpau_subpic.c
+++ b/src/vdpau_subpic.c
@@ -137,10 +137,12 @@ subpicture_add_association(
 )
 {
     SubpictureAssociationP *assocs;
-    assocs = realloc_buffer(&obj_subpicture->assocs,
-                            &obj_subpicture->assocs_count_max,
-                            1 + obj_subpicture->assocs_count,
-                            sizeof(obj_subpicture->assocs[0]));
+    assocs = realloc_buffer(
+        (void **)&obj_subpicture->assocs,
+        &obj_subpicture->assocs_count_max,
+        1 + obj_subpicture->assocs_count,
+        sizeof(obj_subpicture->assocs[0])
+    );
     if (!assocs)
         return -1;
 
diff --git a/src/vdpau_video.c b/src/vdpau_video.c
index 95b341d..3821879 100644
--- a/src/vdpau_video.c
+++ b/src/vdpau_video.c
@@ -272,7 +272,7 @@ int surface_add_association(
     /* Append this subpicture association */
     SubpictureAssociationP *assocs;
     assocs = realloc_buffer(
-        &obj_surface->assocs,
+        (void **)&obj_surface->assocs,
         &obj_surface->assocs_count_max,
         1 + obj_surface->assocs_count,
         sizeof(obj_surface->assocs[0])
diff --git a/src/vdpau_video_x11.c b/src/vdpau_video_x11.c
index 5dabe71..4ddfd1b 100644
--- a/src/vdpau_video_x11.c
+++ b/src/vdpau_video_x11.c
@@ -480,7 +480,7 @@ output_surface_ensure(
 
     /* Append output surface */
     if (new_obj_output) {
-        if (realloc_buffer(&obj_surface->output_surfaces,
+        if (realloc_buffer((void **)&obj_surface->output_surfaces,
                            &obj_surface->output_surfaces_count_max,
                            1 + obj_surface->output_surfaces_count,
                            sizeof(*obj_surface->output_surfaces)) == NULL)