diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
commit | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (patch) | |
tree | b09b4c45898be2754f156ebba16fa1054f42788d /gui/interface.h | |
parent | 3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d (diff) | |
parent | 1fdf02e6fbd896c8fcce03992ecdf36144d85714 (diff) | |
download | mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.bz2 mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.xz |
Merge svn changes up to r27374
Conflicts:
cfg-common-opts.h
cfg-mplayer.h
command.c
configure
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpcodecs/vf_vo.c
libmpdemux/demuxer.h
libmpdemux/stheader.h
mp_core.h
mplayer.c
stream/stream_radio.c
Diffstat (limited to 'gui/interface.h')
-rw-r--r-- | gui/interface.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gui/interface.h b/gui/interface.h index 4b39511b93..372c888d15 100644 --- a/gui/interface.h +++ b/gui/interface.h @@ -24,7 +24,7 @@ #include "libvo/font_load.h" #include "cfg.h" -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD #include "stream/stream.h" #endif @@ -51,7 +51,7 @@ typedef struct char codecdll[128]; } guiVideoStruct; -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD typedef struct { int titles; @@ -83,7 +83,7 @@ typedef struct int DiskChanged; int NewPlay; -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD guiDVDStruct DVD; int Title; int Angle; |