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.h | |
| 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.h')
| -rw-r--r-- | libvo/video_out.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libvo/video_out.h b/libvo/video_out.h index 6a9908e19b..e392b55f2b 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -286,7 +286,7 @@ extern int vo_colorkey; extern int WinID; -#if defined(HAVE_FBDEV) || defined(HAVE_VESA) +#if defined(CONFIG_FBDEV) || defined(CONFIG_VESA) typedef struct { float min; @@ -300,6 +300,6 @@ extern char *monitor_hfreq_str; extern char *monitor_vfreq_str; extern char *monitor_dotclock_str; -#endif /* defined(HAVE_FBDEV) || defined(HAVE_VESA) */ +#endif /* defined(CONFIG_FBDEV) || defined(CONFIG_VESA) */ #endif /* MPLAYER_VIDEO_OUT_H */ |