diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-04-02 23:53:54 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-04-02 23:55:13 +0300 |
| commit | d136cf68827382ad710adb74d02e50364052f430 (patch) | |
| tree | df40e0284c9275bb185bc098cc3ed039bb765692 /libvo/video_out.c | |
| parent | cf9edda1d370d39bc8a3d020a9c2bc4090d2457e (diff) | |
| parent | 83c2df3565c19931b01c3ed75a0e08aca1fb24f2 (diff) | |
| download | mpv-d136cf68827382ad710adb74d02e50364052f430.tar.bz2 mpv-d136cf68827382ad710adb74d02e50364052f430.tar.xz | |
Merge svn changes up to r29134
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 eb348dd086..efd2963252 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -162,12 +162,12 @@ const struct vo_driver *video_out_drivers[] = #ifdef CONFIG_3DFX &video_out_3dfx, #endif -#ifdef CONFIG_XV - &video_out_xv, -#endif #if CONFIG_VDPAU &video_out_vdpau, #endif +#ifdef CONFIG_XV + &video_out_xv, +#endif #ifdef CONFIG_X11 &video_out_x11, &video_out_xover, |