From: Mark Thompson Date: Fri, 27 Apr 2018 12:41:56 +0000 (+0100) Subject: hwcontext_vaapi: Fix compilation with libva versions < 1.4.0 X-Git-Tag: n4.0.1~101 X-Git-Url: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?p=ffmpeg.git;p=ffmpeg.git;a=commitdiff_plain;h=44cb6474770e6603913cb76e3be4278f663aad3e;hp=a768c0a3e1fa29eddc7dd348012b3093e476c94e hwcontext_vaapi: Fix compilation with libva versions < 1.4.0 The BufferHandle API was added in libva 1.4.0 / VAAPI 0.36.0. (cherry picked from commit 92a0a6bea9dc3087fa8d232b750db1dd0d70b157) --- diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 53a5b02822..7daaa951cc 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -1164,6 +1164,7 @@ fail: } #endif +#if VA_CHECK_VERSION(0, 36, 0) typedef struct VAAPIDRMImageBufferMapping { VAImage image; VABufferInfo buffer_info; @@ -1323,6 +1324,7 @@ fail: av_freep(&mapping); return err; } +#endif static int vaapi_map_to_drm(AVHWFramesContext *hwfc, AVFrame *dst, const AVFrame *src, int flags) @@ -1333,7 +1335,10 @@ static int vaapi_map_to_drm(AVHWFramesContext *hwfc, AVFrame *dst, if (err != AVERROR(ENOSYS)) return err; #endif +#if VA_CHECK_VERSION(0, 36, 0) return vaapi_map_to_drm_abh(hwfc, dst, src, flags); +#endif + return AVERROR(ENOSYS); } #endif /* CONFIG_LIBDRM */