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/mplayer/play.c | |
| 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/mplayer/play.c')
| -rw-r--r-- | gui/mplayer/play.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gui/mplayer/play.c b/gui/mplayer/play.c index 2e7f379324..a06370c2b8 100644 --- a/gui/mplayer/play.c +++ b/gui/mplayer/play.c @@ -104,7 +104,7 @@ void mplEnd( void ) guiIntfStruct.AudioType=0; guiIntfStruct.NoWindow=False; -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD guiIntfStruct.DVD.current_title=1; guiIntfStruct.DVD.current_chapter=1; guiIntfStruct.DVD.current_angle=1; @@ -292,7 +292,7 @@ void mplCurr( void ) if ( guiIntfStruct.Playing == 2 ) return; switch ( guiIntfStruct.StreamType ) { -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD case STREAMTYPE_DVD: break; #endif @@ -322,7 +322,7 @@ void mplPrev( void ) if ( guiIntfStruct.Playing == 2 ) return; switch ( guiIntfStruct.StreamType ) { -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD case STREAMTYPE_DVD: if ( --guiIntfStruct.DVD.current_chapter == 0 ) { @@ -358,7 +358,7 @@ void mplNext( void ) if ( guiIntfStruct.Playing == 2 ) return; switch ( guiIntfStruct.StreamType ) { -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD case STREAMTYPE_DVD: if ( guiIntfStruct.DVD.current_chapter++ == guiIntfStruct.DVD.chapters ) { |