diff options
| author | wm4 <wm4@nowhere> | 2013-11-04 00:43:06 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-11-04 00:43:06 +0100 |
| commit | f7b2d644eff7fae2d74259ae14ec2b05b00c9b9b (patch) | |
| tree | ca5462391d6a8f7b8e254c51c88f30efea91b90f /Makefile | |
| parent | 37388ebb0ef9085c841d7f94e665a5a77cfe0e92 (diff) | |
| parent | 25affdcc886ce010995804553396d81d90a321d3 (diff) | |
| download | mpv-f7b2d644eff7fae2d74259ae14ec2b05b00c9b9b.tar.bz2 mpv-f7b2d644eff7fae2d74259ae14ec2b05b00c9b9b.tar.xz | |
Merge branch 'master' into have_configure
Conflicts:
configure
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -121,6 +121,7 @@ SOURCES-$(VAAPI) += video/out/vo_vaapi.c \ video/decode/vaapi.c \ video/vaapi.c SOURCES-$(VAAPI_VPP) += video/filter/vf_vavpp.c +SOURCES-$(VAAPI_GLX) += video/out/gl_hwdec_vaglx.c SOURCES-$(X11) += video/out/vo_x11.c video/out/x11_common.c SOURCES-$(XV) += video/out/vo_xv.c |