diff options
| author | ivo <ivo@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-03-01 03:51:48 +0000 |
|---|---|---|
| committer | ivo <ivo@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-03-01 03:51:48 +0000 |
| commit | 91e58712dff4d0796c19792bf1e25337c7c6c277 (patch) | |
| tree | 49d83c849e3ded9b33728b976adbd7ac9271bdf9 /cfg-mplayer.h | |
| parent | 311ecb1bfad6ef8b7d25513339657e638eb2da4b (diff) | |
| download | mpv-91e58712dff4d0796c19792bf1e25337c7c6c277.tar.bz2 mpv-91e58712dff4d0796c19792bf1e25337c7c6c277.tar.xz | |
Remove -noxv and -forcexv command line options and replace them by
suboptions to -vo sdl. Renamed noxv to nohwaccel to better reflect the
meaning of the option. Updated manual page.
Original patch by < ods15 at ods15 dot dyndns dot org>
Modified by me.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14858 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-mplayer.h')
| -rw-r--r-- | cfg-mplayer.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 3f2b12ff8f..fb5c518a86 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -22,12 +22,6 @@ extern char *fb_mode_name; extern char *dfb_params; #endif #endif -#ifdef HAVE_SDL -//extern char *sdl_driver; -extern int sdl_noxv; -extern int sdl_forcexv; -//extern char *sdl_adriver; -#endif #ifdef USE_FAKE_MONO extern int fakemono; // defined in dec_audio.c #endif @@ -199,15 +193,13 @@ m_option_t mplayer_opts[]={ CONF_TYPE_PRINT, 0, 0, 0, NULL}, #endif // -vo sdl only: -#ifdef HAVE_SDL - {"sdl", "Use -vo sdl:driver instead of -vo sdl -sdl driver.\n", + {"sdl", "Use -vo sdl:driver=<driver> instead of -vo sdl -sdl driver.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, - {"noxv", &sdl_noxv, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"forcexv", &sdl_forcexv, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"noxv", "-noxv is deprecated. Use -vo sdl:nohwaccel instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"forcexv", "-forcexv is deprecated. Use -vo sdl:forcexv instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, // -ao sdl only: {"sdla", "Use -ao sdl:driver instead of -ao sdl -sdla driver.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, -#endif #if defined(HAVE_FBDEV)||defined(HAVE_VESA) {"monitor-hfreq", &monitor_hfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, |