From bf8bf1f5f2b64797d1f85f3007711109aede95d1 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 18 Sep 2013 13:49:34 +0100 Subject: More vaapi build fixes. --- src/video_out/video_out_vaapi.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/video_out/video_out_vaapi.c b/src/video_out/video_out_vaapi.c index ade498d3a..2c1b4e16a 100644 --- a/src/video_out/video_out_vaapi.c +++ b/src/video_out/video_out_vaapi.c @@ -72,6 +72,12 @@ #include "accel_vaapi.h" +#ifdef HAVE_FFMPEG_AVUTIL_H +# include +#else +# include +#endif + #ifndef VA_SURFACE_ATTRIB_SETTABLE #define vaCreateSurfaces(d, f, w, h, s, ns, a, na) \ vaCreateSurfaces(d, w, h, f, ns, s) @@ -1637,7 +1643,7 @@ static void vaapi_property_callback (void *property_gen, xine_cfg_entry_t *entry lprintf("vaapi_property_callback property=%d, value=%d\n", property->type, entry->num_value ); - VAStatus vaStatus = vaSetDisplayAttributes(va_context->va_display, &attr, 1); + /*VAStatus vaStatus = */ vaSetDisplayAttributes(va_context->va_display, &attr, 1); //vaapi_check_status((vo_driver_t *)this, vaStatus, "vaSetDisplayAttributes()"); vaapi_show_display_props((vo_driver_t*)this); @@ -1769,7 +1775,7 @@ static void vaapi_display_attribs(vo_driver_t *this_gen) { static void vaapi_set_background_color(vo_driver_t *this_gen) { vaapi_driver_t *this = (vaapi_driver_t *)this_gen; ff_vaapi_context_t *va_context = this->va_context; - VAStatus vaStatus; + //VAStatus vaStatus; if(!va_context->valid_context) return; @@ -1780,7 +1786,7 @@ static void vaapi_set_background_color(vo_driver_t *this_gen) { attr.type = VADisplayAttribBackgroundColor; attr.value = 0x000000; - vaStatus = vaSetDisplayAttributes(va_context->va_display, &attr, 1); + /*vaStatus =*/ vaSetDisplayAttributes(va_context->va_display, &attr, 1); //vaapi_check_status(this_gen, vaStatus, "vaSetDisplayAttributes()"); } -- cgit v1.2.3