diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-21 17:39:30 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-21 17:39:30 +0200 |
| commit | ebb541c6553af10203b2c2f5bcead6118a44f5be (patch) | |
| tree | 3d98d89722d6784891b5da91555f22f76cdc92cf /libvo/video_out.c | |
| parent | e46317a1db077a7f92ea5db7bb76e6cc899f1a64 (diff) | |
| parent | a9abd00be4bfb498e1ba4e0ebc02c828a1a3db07 (diff) | |
| download | mpv-ebb541c6553af10203b2c2f5bcead6118a44f5be.tar.bz2 mpv-ebb541c6553af10203b2c2f5bcead6118a44f5be.tar.xz | |
Merge svn changes up to r28690
Diffstat (limited to 'libvo/video_out.c')
| -rw-r--r-- | libvo/video_out.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c index e81faee69d..ed72a765ef 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -158,12 +158,12 @@ const struct vo_driver *video_out_drivers[] = #ifdef CONFIG_3DFX &video_out_3dfx, #endif -#if CONFIG_VDPAU - &video_out_vdpau, -#endif #ifdef CONFIG_XV &video_out_xv, #endif +#if CONFIG_VDPAU + &video_out_vdpau, +#endif #ifdef CONFIG_X11 &video_out_x11, &video_out_xover, |