2013-07-13 16:24:07 +00:00
|
|
|
commit dc4b64c97b82d4d590ccf7fa1c938435cc26d98e
|
|
|
|
|
Author: Timo Rothenpieler <timo@rothenpieler.org>
|
|
|
|
|
Date: Sun Jan 20 15:49:23 2013 +0000
|
|
|
|
|
|
|
|
|
|
Make vaapi decoder compatible with latest libva changes
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
|
|
|
|
|
|
|
|
|
|
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
|
2013-07-15 12:19:42 +00:00
|
|
|
@@ -46,6 +46,7 @@
|
|
|
|
|
#include <libavcodec/vaapi.h>
|
|
|
|
|
|
|
|
|
|
#include <X11/Xlib.h>
|
|
|
|
|
+#include <va/va_version.h>
|
|
|
|
|
#include <va/va_x11.h>
|
|
|
|
|
|
|
|
|
|
typedef struct
|
|
|
|
|
@@ -246,8 +247,14 @@ static int CreateSurfaces( vlc_va_vaapi_
|
2013-07-13 16:24:07 +00:00
|
|
|
|
|
|
|
|
/* Create surfaces */
|
|
|
|
|
VASurfaceID pi_surface_id[p_va->i_surface_count];
|
2013-07-15 10:06:12 +00:00
|
|
|
+/* vaCreateSurfaces API changed with version 1.2.0 */
|
2013-07-15 12:19:42 +00:00
|
|
|
+#if VA_CHECK_VERSION( 0, 34, 0 )
|
2013-07-13 16:24:07 +00:00
|
|
|
+ if( vaCreateSurfaces( p_va->p_display, VA_RT_FORMAT_YUV420, i_width, i_height,
|
|
|
|
|
+ pi_surface_id, p_va->i_surface_count, NULL, 0 ) )
|
2013-07-15 10:06:12 +00:00
|
|
|
+#else
|
|
|
|
|
if( vaCreateSurfaces( p_va->p_display, i_width, i_height, VA_RT_FORMAT_YUV420,
|
|
|
|
|
p_va->i_surface_count, pi_surface_id ) )
|
|
|
|
|
+#endif
|
2013-07-13 16:24:07 +00:00
|
|
|
{
|
|
|
|
|
for( int i = 0; i < p_va->i_surface_count; i++ )
|
|
|
|
|
p_va->p_surface[i].i_id = VA_INVALID_SURFACE;
|
