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/gui_common.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/gui_common.c')
| -rw-r--r-- | gui/mplayer/gui_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gui/mplayer/gui_common.c b/gui/mplayer/gui_common.c index 0bfeb9b805..b422fc4a0b 100644 --- a/gui/mplayer/gui_common.c +++ b/gui/mplayer/gui_common.c @@ -71,7 +71,7 @@ static inline void TranslateFilename( int c,char * tmp,size_t tmplen ) if ( tmp[strlen( tmp ) - 5] == '.' ) tmp[strlen( tmp ) - 5]=0; } else av_strlcpy( tmp,MSGTR_NoFileLoaded,tmplen ); break; -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD case STREAMTYPE_DVD: if ( guiIntfStruct.DVD.current_chapter ) snprintf(tmp,tmplen,MSGTR_Chapter,guiIntfStruct.DVD.current_chapter ); else av_strlcat( tmp,MSGTR_NoChapter,tmplen ); @@ -178,7 +178,7 @@ calclengthmmmmss: case STREAMTYPE_VCD: av_strlcat( trbuf,"v",sizeof( trbuf ) ); break; #endif case STREAMTYPE_STREAM: av_strlcat( trbuf,"u",sizeof( trbuf ) ); break; -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD case STREAMTYPE_DVD: av_strlcat( trbuf,"d",sizeof( trbuf ) ); break; #endif default: av_strlcat( trbuf," ",sizeof( trbuf ) ); break; |