From 6d92a9345c96b6e3f531e7f7b71248472cace95f Mon Sep 17 00:00:00 2001
From: philippegorley <philippe.gorley@savoirfairelinux.com>
Date: Wed, 2 Nov 2016 16:04:36 -0400
Subject: [PATCH] disable vdpau in ffmpeg

Fixes an issue where Ring would sometimes fail to build because
of an undefined reference to "vdp_device_create_x11".

VDPAU should be re-enabled once it is implemented.

Change-Id: Idc420931674f7455a6ae561afa9da6e5808d78fb
Reviewed-by: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
---
 contrib/src/ffmpeg/rules.mak | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 6737dbe752..133eed70e3 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -94,6 +94,7 @@ endif
 
 ifdef HAVE_LINUX
 FFMPEGCONF += \
+	--disable-vdpau \
 	--enable-vaapi \
 	--enable-hwaccel=h264_vaapi \
 	--enable-hwaccel=mpeg4_vaapi \
-- 
GitLab