summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-12-20 00:43:42 +0100
committerMartin Herkt <lachs0r@srsfckn.biz>2017-12-21 19:45:32 +0100
commit3412c1a1aa609a580150925aa28a8de0f10d8ef7 (patch)
tree3d9d8442ed3d83e880ffb7bdc6e1f506c80ca8ca /.travis.yml
parent2ce7face96c3c08582cd4aebf59aa99a9d741a7f (diff)
downloadmpv-3412c1a1aa609a580150925aa28a8de0f10d8ef7.tar.bz2
mpv-3412c1a1aa609a580150925aa28a8de0f10d8ef7.tar.xz
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.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml1
1 files changed, 1 insertions, 0 deletions
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="