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.
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 3b29fb3b5b..73c2534d28 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ os:
 env:
   matrix:
     - LIBAV=ffmpeg-git
+    - LIBAV=libav-git
   global:
     # Coverity token
     - secure: "H21mSRlMhk4BKS0xHZvCFGJxteCP0hRVUxTuNfM2Z9HBsyutuLEYMtViLO86VtM+Tqla3xXPzUdS4ozLwI72Ax/5ZUDXACROj73yW6QhFB5D6rLut12+FjqC7M33Qv2hl0xwgNBmR5dsm1ToP37+Wn+ecJQNvN8fkTXF+HVzOEw="
-- 
cgit v1.2.3