diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:04:43 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:13:09 +0300 |
commit | 17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069 (patch) | |
tree | 5d1910a2ab6381f6b4fb0ffc2834f55f7fef7129 /help/help_mp-en.h | |
parent | 2ba9df3df3d61a7cc1bde9f897bc77eaaf14b383 (diff) | |
parent | af76be6e197382af491fadef3fcf821a721c99f5 (diff) | |
download | mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.bz2 mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.xz |
Merge svn changes up to r27441
Conflicts:
cfg-common-opts.h
command.c
configure
input/input.c
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpdemux/stheader.h
libvo/sub.c
libvo/video_out.c
libvo/vo_xv.c
libvo/vosub_vidix.c
libvo/x11_common.c
libvo/x11_common.h
mp_core.h
mplayer.c
stream/stream.h
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 aff75d2703..5a82a3943f 100644 --- a/help/help_mp-en.h +++ b/help/help_mp-en.h @@ -19,7 +19,7 @@ static char help_text[]= "Basic options: (complete list in the man page)\n" " -vo <drv> select video output driver ('-vo help' for a list)\n" " -ao <drv> select audio output driver ('-ao help' for a list)\n" -#ifdef HAVE_VCD +#ifdef CONFIG_VCD " vcd://<trackno> play (S)VCD (Super Video CD) track (raw device, no mount)\n" #endif #ifdef CONFIG_DVDREAD |