From 3412c1a1aa609a580150925aa28a8de0f10d8ef7 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 20 Dec 2017 00:43:42 +0100
Subject: Restore Libav support

Libav has been broken due to the hwdec changes. This was always a
temporary situation (depended on pending patches to be merged), although
it took a bit longer. This also restores the travis config.

One code change is needed in vd_lavc.c, because it checks the AV_PIX_FMT
for videotoolbox (as opposed to the mpv format identifier), which is not
available in Libav. Add an ifdef; the affected code is for a deprecated
option anyway.
---
 wscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wscript')

diff --git a/wscript b/wscript
index 4a1959b2a6..b4caba9531 100644
--- a/wscript
+++ b/wscript
@@ -421,7 +421,7 @@ ffmpeg_pkg_config_checks = [
 ]
 libav_pkg_config_checks = [
     'libavutil',     '>= 56.6.0',
-    'libavcodec',    '>= 58.5.0',
+    'libavcodec',    '>= 58.8.0',
     'libavformat',   '>= 58.1.0',
     'libswscale',    '>= 5.0.0',
     'libavfilter',   '>= 7.0.0',
-- 
cgit v1.2.3