summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTorsten Jager <t.jager@gmx.de>2014-05-09 18:13:25 +0200
committerTorsten Jager <t.jager@gmx.de>2014-05-09 18:13:25 +0200
commit92759df506622b9680eb94de79d9482ba1e162d3 (patch)
treef46b4a3afda3725b11b56813c9e67a72f181c12f /src
parent5ac9fb9652562e4cd95bba9b40a801848206f83f (diff)
downloadxine-lib-92759df506622b9680eb94de79d9482ba1e162d3.tar.gz
xine-lib-92759df506622b9680eb94de79d9482ba1e162d3.tar.bz2
vo_vaapi: silence warning.
video_out_vaapi.c: In function ‘vaapi_ovl_associate’: video_out_vaapi.c:2465:5: warning: passing argument 3 of ‘vaMapBuffer’ from incompatible pointer type /usr/local/include/va/va.h:1830:10: note: expected ‘void **’ but argument is of type ‘unsigned char **’ No joke.
Diffstat (limited to 'src')
-rw-r--r--src/video_out/video_out_vaapi.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/video_out/video_out_vaapi.c b/src/video_out/video_out_vaapi.c
index e7da0ac77..a234fa133 100644
--- a/src/video_out/video_out_vaapi.c
+++ b/src/video_out/video_out_vaapi.c
@@ -2451,8 +2451,9 @@ static int vaapi_ovl_associate(vo_driver_t *this_gen, int format, int bShow) {
unsigned int flags = 0;
unsigned int output_width = va_context->width;
unsigned int output_height = va_context->height;
- unsigned char *p_base = NULL;
+ unsigned char *p_dest;
uint32_t *p_src;
+ void *p_base = NULL;
VAStatus vaStatus;
int i;
@@ -2467,9 +2468,10 @@ static int vaapi_ovl_associate(vo_driver_t *this_gen, int format, int bShow) {
return 0;
p_src = this->overlay_bitmap;
+ p_dest = p_base;
for (i = 0; i < this->overlay_bitmap_height; i++) {
- xine_fast_memcpy((uint32_t *)p_base, p_src, this->overlay_bitmap_width * sizeof(uint32_t));
- p_base += va_context->va_subpic_image.pitches[0];
+ xine_fast_memcpy(p_dest, p_src, this->overlay_bitmap_width * sizeof(uint32_t));
+ p_dest += va_context->va_subpic_image.pitches[0];
p_src += this->overlay_bitmap_width;
}