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 /video/out/gl_common.c | |
| 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 'video/out/gl_common.c')
| -rw-r--r-- | video/out/gl_common.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/video/out/gl_common.c b/video/out/gl_common.c index d39a09df16..f3e38a2171 100644 --- a/video/out/gl_common.c +++ b/video/out/gl_common.c @@ -1008,3 +1008,12 @@ void mp_log_source(struct mp_log *log, int lev, const char *src) src = next; } } + +extern const struct gl_hwdec_driver gl_hwdec_vaglx; + +const struct gl_hwdec_driver *mpgl_hwdec_drivers[] = { +#if HAVE_VAAPI_GLX + &gl_hwdec_vaglx, +#endif + NULL +}; |