[FFmpeg-cvslog] hwcontext_vaapi: Fix compilation with libva versions < 1.4.0
Mark Thompson
git at videolan.org
Sat Apr 28 01:41:29 EEST 2018
ffmpeg | branch: master | Mark Thompson <sw at jkqxz.net> | Fri Apr 27 13:41:56 2018 +0100| [92a0a6bea9dc3087fa8d232b750db1dd0d70b157] | committer: Mark Thompson
hwcontext_vaapi: Fix compilation with libva versions < 1.4.0
The BufferHandle API was added in libva 1.4.0 / VAAPI 0.36.0.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=92a0a6bea9dc3087fa8d232b750db1dd0d70b157
---
libavutil/hwcontext_vaapi.c | 5 +++++
1 file changed, 5 insertions(+)
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 */
More information about the ffmpeg-cvslog
mailing list