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 /help/help_mp-en.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 'help/help_mp-en.h')
| -rw-r--r-- | help/help_mp-en.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/help/help_mp-en.h b/help/help_mp-en.h index bb01af1222..aff75d2703 100644 --- a/help/help_mp-en.h +++ b/help/help_mp-en.h @@ -22,7 +22,7 @@ static char help_text[]= #ifdef HAVE_VCD " vcd://<trackno> play (S)VCD (Super Video CD) track (raw device, no mount)\n" #endif -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD " dvd://<titleno> play DVD title from device instead of plain file\n" #endif " -alang/-slang select DVD audio/subtitle language (by 2-char country code)\n" |