summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authoriive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-01-18 18:11:02 +0000
committeriive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-01-18 18:11:02 +0000
commitbfd33f656b0a27277fe541e79771c5194c16a89d (patch)
tree8cbbaa8ba405eb184902fe00affd1895fa220b26 /libvo
parent58c577a6f3ab6a3b0666e520b23f6a95ccc2c97a (diff)
downloadmpv-bfd33f656b0a27277fe541e79771c5194c16a89d.tar.bz2
mpv-bfd33f656b0a27277fe541e79771c5194c16a89d.tar.xz
prevent xvmc from been loaded before xv, and generally before any autoprobed output
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17424 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/video_out.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c
index b4601a3887..80d61af1b5 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -163,9 +163,6 @@ vo_functions_t* video_out_drivers[] =
#ifdef HAVE_3DFX
&video_out_3dfx,
#endif
-#ifdef HAVE_XVMC
- &video_out_xvmc,
-#endif
#ifdef HAVE_XV
&video_out_xv,
#endif
@@ -233,6 +230,9 @@ vo_functions_t* video_out_drivers[] =
#endif
&video_out_null,
// should not be auto-selected
+#ifdef HAVE_XVMC
+ &video_out_xvmc,
+#endif
&video_out_mpegpes,
&video_out_yuv4mpeg,
#ifdef HAVE_PNG