summaryrefslogtreecommitdiffstats
path: root/libvo/video_out.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2008-11-22 19:16:43 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2008-11-22 19:16:43 +0200
commit6cbca28085f1698bc7c6537631d5efbadf64abf1 (patch)
tree13a3ad21a732b168399ce9b34bbb0a57784dd54e /libvo/video_out.c
parent1715c2a33632b333f8e8e581ef23ea5fe0234edd (diff)
parenta83e00009000c4907254daa141d491d0479e961d (diff)
downloadmpv-6cbca28085f1698bc7c6537631d5efbadf64abf1.tar.bz2
mpv-6cbca28085f1698bc7c6537631d5efbadf64abf1.tar.xz
Merge svn changes up to r27979
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 88bacc639f..5ca841ec55 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -81,6 +81,7 @@ extern struct vo_driver video_out_aa;
extern struct vo_driver video_out_caca;
extern struct vo_driver video_out_mpegpes;
extern struct vo_driver video_out_yuv4mpeg;
+extern struct vo_driver video_out_direct3d;
extern struct vo_driver video_out_directx;
extern struct vo_driver video_out_dxr2;
extern struct vo_driver video_out_dxr3;
@@ -113,6 +114,9 @@ const struct vo_driver *video_out_drivers[] =
#ifdef CONFIG_DIRECTX
&video_out_directx,
#endif
+#ifdef CONFIG_DIRECT3D
+ &video_out_direct3d,
+#endif
#ifdef CONFIG_COREVIDEO
&video_out_macosx,
#endif