[FFmpeg-cvslog] hwcontext_vaapi: Fix build failure with old libdrm

Jun Zhao git at videolan.org
Fri Sep 15 01:09:52 EEST 2017


ffmpeg | branch: master | Jun Zhao <jun.zhao at intel.com> | Wed Sep 13 20:21:38 2017 -0400| [197d298ab3b27d1ec2ee7bf568debca105881a54] | committer: Mark Thompson

hwcontext_vaapi: Fix build failure with old libdrm

Signed-off-by: Jun Zhao <jun.zhao at intel.com>
Signed-off-by: Mark Thompson <sw at jkqxz.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=197d298ab3b27d1ec2ee7bf568debca105881a54
---

 libavutil/hwcontext_vaapi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c
index 2cc6f26715..852f0abda2 100644
--- a/libavutil/hwcontext_vaapi.c
+++ b/libavutil/hwcontext_vaapi.c
@@ -918,9 +918,11 @@ static const struct {
     int   nb_layer_formats;
     uint32_t layer_formats[AV_DRM_MAX_PLANES];
 } vaapi_drm_format_map[] = {
+#ifdef DRM_FORMAT_R8
     DRM_MAP(NV12, 2, DRM_FORMAT_R8,  DRM_FORMAT_RG88),
+#endif
     DRM_MAP(NV12, 1, DRM_FORMAT_NV12),
-#ifdef VA_FOURCC_P010
+#if defined(VA_FOURCC_P010) && defined(DRM_FORMAT_R16)
     DRM_MAP(P010, 2, DRM_FORMAT_R16, DRM_FORMAT_RG1616),
 #endif
     DRM_MAP(BGRA, 1, DRM_FORMAT_BGRA8888),



More information about the ffmpeg-cvslog mailing list