diff options
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/video_out.c | 6 | ||||
| -rw-r--r-- | libvo/vo_dxr3.c | 3 |
2 files changed, 3 insertions, 6 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, diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c index e9474a0eb2..9893e80fb0 100644 --- a/libvo/vo_dxr3.c +++ b/libvo/vo_dxr3.c @@ -37,9 +37,6 @@ #include "config.h" #include "mp_msg.h" #include "help_mp.h" -#if HAVE_MALLOC_H -#include <malloc.h> -#endif #include "fastmemcpy.h" #include "video_out.h" |