1 From 581e530bf98f253fea39ec9bfd9f3287acb1a8c6 Mon Sep 17 00:00:00 2001
2 From: Timo Rothenpieler <timo@rothenpieler.org>
3 Date: Sun, 20 Jan 2013 15:49:23 +0000
4 Subject: [PATCH] Make vaapi decoder compatible with latest libva changes
6 Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
7 (cherry picked from commit dc4b64c97b82d4d590ccf7fa1c938435cc26d98e)
8 Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
10 modules/codec/avcodec/vaapi.c | 9 +++++++--
11 1 file changed, 7 insertions(+), 2 deletions(-)
13 diff --git a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c
14 index 893ea15..d8703a0 100644
15 --- a/modules/codec/avcodec/vaapi.c
16 +++ b/modules/codec/avcodec/vaapi.c
21 +#ifndef VA_SURFACE_ATTRIB_SETTABLE
22 +#define vaCreateSurfaces(d, f, w, h, s, ns, a, na) \
23 + vaCreateSurfaces(d, w, h, f, ns, s)
26 #ifdef HAVE_AVCODEC_VAAPI
29 @@ -258,8 +263,8 @@ static int CreateSurfaces( vlc_va_sys_t *p_va, void **pp_hw_ctx, vlc_fourcc_t *p
32 VASurfaceID pi_surface_id[p_va->i_surface_count];
33 - if( vaCreateSurfaces( p_va->p_display, i_width, i_height, VA_RT_FORMAT_YUV420,
34 - p_va->i_surface_count, pi_surface_id ) )
35 + if( vaCreateSurfaces( p_va->p_display, VA_RT_FORMAT_YUV420, i_width, i_height,
36 + pi_surface_id, p_va->i_surface_count, NULL, 0 ) )
38 for( int i = 0; i < p_va->i_surface_count; i++ )
39 p_va->p_surface[i].i_id = VA_INVALID_SURFACE;