ffmpeg | branch: master | Mark Thompson <s...@jkqxz.net> | Sun Mar 18 18:34:38 2018 +0000| [0f3d1c69b5ed2206e061261503b0c34b3bfda617] | committer: Mark Thompson
hwcontext_vaapi: Always include DRM hwcontext header Fixes building with VAAPI but not libdrm, which was broken by 389f4c3e0d0a26a7d3d2696017384874cf5e93fa. Just unconditionally include the header, since it doesn't depend on libdrm being present. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0f3d1c69b5ed2206e061261503b0c34b3bfda617 --- libavutil/hwcontext_vaapi.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 99f76b9169..3797005433 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -40,15 +40,13 @@ #include "buffer.h" #include "common.h" #include "hwcontext.h" +#include "hwcontext_drm.h" #include "hwcontext_internal.h" #include "hwcontext_vaapi.h" #include "mem.h" #include "pixdesc.h" #include "pixfmt.h" -#if CONFIG_LIBDRM -# include "hwcontext_drm.h" -#endif typedef struct VAAPIDevicePriv { #if HAVE_VAAPI_X11 _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog