commit dc4b64c97b82d4d590ccf7fa1c938435cc26d98e Author: Timo Rothenpieler Date: Sun Jan 20 15:49:23 2013 +0000 Make vaapi decoder compatible with latest libva changes Signed-off-by: Jean-Baptiste Kempf Index: vlc-2.0.7/modules/codec/avcodec/vaapi.c =================================================================== --- vlc-2.0.7.orig/modules/codec/avcodec/vaapi.c +++ vlc-2.0.7/modules/codec/avcodec/vaapi.c @@ -46,6 +46,7 @@ #include #include +#include #include typedef struct @@ -246,8 +247,14 @@ static int CreateSurfaces( vlc_va_vaapi_ /* Create surfaces */ VASurfaceID pi_surface_id[p_va->i_surface_count]; +/* vaCreateSurfaces API changed with version 1.2.0 */ +#if VA_CHECK_VERSION( 0, 34, 0 ) + if( vaCreateSurfaces( p_va->p_display, VA_RT_FORMAT_YUV420, i_width, i_height, + pi_surface_id, p_va->i_surface_count, NULL, 0 ) ) +#else if( vaCreateSurfaces( p_va->p_display, i_width, i_height, VA_RT_FORMAT_YUV420, p_va->i_surface_count, pi_surface_id ) ) +#endif { for( int i = 0; i < p_va->i_surface_count; i++ ) p_va->p_surface[i].i_id = VA_INVALID_SURFACE;