summaryrefslogtreecommitdiffstats
path: root/libvo/video_out.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-01-08 01:36:05 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-01-08 01:36:05 +0200
commitb390b9b28fa6280f355eeef4811b6cfc02dea01a (patch)
treeef67be7ab1b189f5818fb8a273fa10f19d19aec6 /libvo/video_out.c
parentefe742e3fa08f007ab41f1d666fd1f1c3bf0d63a (diff)
parent8e778e501948b67b1f8cd889e68242d1a1eb6041 (diff)
downloadmpv-b390b9b28fa6280f355eeef4811b6cfc02dea01a.tar.bz2
mpv-b390b9b28fa6280f355eeef4811b6cfc02dea01a.tar.xz
Merge svn changes up to r30185
Diffstat (limited to 'libvo/video_out.c')
-rw-r--r--libvo/video_out.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c
index 1241b65537..0fec6153eb 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -87,6 +87,7 @@ extern struct vo_driver video_out_vdpau;
extern struct vo_driver video_out_xv;
extern struct vo_driver video_out_gl;
extern struct vo_driver video_out_gl2;
+extern struct vo_driver video_out_matrixview;
extern struct vo_driver video_out_dga;
extern struct vo_driver video_out_sdl;
extern struct vo_driver video_out_3dfx;
@@ -184,6 +185,9 @@ const struct vo_driver *video_out_drivers[] =
&video_out_gl,
&video_out_gl2,
#endif
+#ifdef CONFIG_MATRIXVIEW
+ &video_out_matrixview,
+#endif
#ifdef CONFIG_DGA
&video_out_dga,
#endif