From 92759df506622b9680eb94de79d9482ba1e162d3 Mon Sep 17 00:00:00 2001 From: Torsten Jager Date: Fri, 9 May 2014 18:13:25 +0200 Subject: =?UTF-8?q?vo=5Fvaapi:=20silence=20warning.=20video=5Fout=5Fvaapi.?= =?UTF-8?q?c:=20In=20function=20=C3=A2=C2=80=C2=98vaapi=5Fovl=5Fassociate?= =?UTF-8?q?=C3=A2=C2=80=C2=99:=20video=5Fout=5Fvaapi.c:2465:5:=20warning:?= =?UTF-8?q?=20passing=20argument=203=20of=20=C3=A2=C2=80=C2=98vaMapBuffer?= =?UTF-8?q?=C3=A2=C2=80=C2=99=20from=20incompatible=20pointer=20type=20/us?= =?UTF-8?q?r/local/include/va/va.h:1830:10:=20note:=20expected=20=C3=A2?= =?UTF-8?q?=C2=80=C2=98void=20**=C3=A2=C2=80=C2=99=20but=20argument=20is?= =?UTF-8?q?=20of=20type=20=C3=A2=C2=80=C2=98unsigned=20char=20**=C3=A2?= =?UTF-8?q?=C2=80=C2=99=20No=20joke.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/video_out/video_out_vaapi.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src') 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; } -- cgit v1.2.3