diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-02 22:04:35 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-02 22:04:35 +0300 |
commit | 6cce822505c0a76ac520909a895021b8f5b7e5ab (patch) | |
tree | f8ba954c698470208a243be3da216f7f54367f46 /libvo/video_out.c | |
parent | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (diff) | |
parent | ded7033671fb7d84fbdb67ace46c1fc8833631bc (diff) | |
download | mpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.bz2 mpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.xz |
Merge svn changes up to r27399
Conflicts:
libmpcodecs/vd.c
libmpcodecs/ve_raw.c
libvo/video_out.c
libvo/x11_common.c
mplayer.c
Diffstat (limited to 'libvo/video_out.c')
-rw-r--r-- | libvo/video_out.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c index ba5051d4c4..e932e3c59c 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -103,13 +103,13 @@ extern struct vo_driver video_out_md5sum; const struct vo_driver *video_out_drivers[] = { -#ifdef HAVE_XVR100 +#ifdef CONFIG_XVR100 &video_out_xvr100, #endif -#ifdef HAVE_TDFX_VID +#ifdef CONFIG_TDFX_VID &video_out_tdfx_vid, #endif -#ifdef HAVE_DIRECTX +#ifdef CONFIG_DIRECTX &video_out_directx, #endif #ifdef HAVE_COREVIDEO @@ -118,19 +118,19 @@ const struct vo_driver *video_out_drivers[] = #ifdef HAVE_QUARTZ &video_out_quartz, #endif -#ifdef HAVE_XMGA +#ifdef CONFIG_XMGA &video_out_xmga, #endif -#ifdef HAVE_MGA +#ifdef CONFIG_MGA &video_out_mga, #endif -#ifdef HAVE_TDFXFB +#ifdef CONFIG_TDFXFB &video_out_tdfxfb, #endif -#ifdef HAVE_S3FB +#ifdef CONFIG_S3FB &video_out_s3fb, #endif -#ifdef HAVE_3DFX +#ifdef CONFIG_3DFX &video_out_3dfx, #endif #ifdef HAVE_XV @@ -140,30 +140,30 @@ const struct vo_driver *video_out_drivers[] = &video_out_x11, &video_out_xover, #endif -#ifdef HAVE_GL +#ifdef CONFIG_GL &video_out_gl, &video_out_gl2, #endif #ifdef HAVE_DGA &video_out_dga, #endif -#ifdef HAVE_SDL +#ifdef CONFIG_SDL &video_out_sdl, #endif -#ifdef HAVE_GGI +#ifdef CONFIG_GGI &video_out_ggi, #endif -#ifdef HAVE_FBDEV +#ifdef CONFIG_FBDEV &video_out_fbdev, &video_out_fbdev2, #endif -#ifdef HAVE_SVGALIB +#ifdef CONFIG_SVGALIB &video_out_svga, #endif -#ifdef HAVE_AA +#ifdef CONFIG_AA &video_out_aa, #endif -#ifdef HAVE_CACA +#ifdef CONFIG_CACA &video_out_caca, #endif #ifdef HAVE_DXR2 @@ -182,16 +182,16 @@ const struct vo_driver *video_out_drivers[] = &video_out_zr, &video_out_zr2, #endif -#ifdef HAVE_BL +#ifdef CONFIG_BL &video_out_bl, #endif -#ifdef HAVE_VESA +#ifdef CONFIG_VESA &video_out_vesa, #endif -#ifdef HAVE_DIRECTFB +#ifdef CONFIG_DIRECTFB &video_out_directfb, #endif -#ifdef HAVE_DFBMGA +#ifdef CONFIG_DFBMGA &video_out_dfbmga, #endif #ifdef CONFIG_VIDIX @@ -209,7 +209,7 @@ const struct vo_driver *video_out_drivers[] = &video_out_xvmc, #endif &video_out_mpegpes, -#ifdef HAVE_YUV4MPEG +#ifdef CONFIG_YUV4MPEG &video_out_yuv4mpeg, #endif #ifdef HAVE_PNG @@ -221,13 +221,13 @@ const struct vo_driver *video_out_drivers[] = #ifdef HAVE_GIF &video_out_gif89a, #endif -#ifdef HAVE_TGA +#ifdef CONFIG_TGA &video_out_tga, #endif #ifdef HAVE_PNM &video_out_pnm, #endif -#ifdef HAVE_MD5SUM +#ifdef CONFIG_MD5SUM &video_out_md5sum, #endif NULL @@ -381,7 +381,7 @@ int vo_config(struct vo *vo, uint32_t width, uint32_t height, return ret; } -#if defined(HAVE_FBDEV)||defined(HAVE_VESA) +#if defined(CONFIG_FBDEV)||defined(CONFIG_VESA) /* Borrowed from vo_fbdev.c Monitor ranges related functions*/ |