Mercurial > mplayer.hg

comparison cfg-mplayer.h @ 14857:29a09f111b41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author ivo
date Tue, 01 Mar 2005 03:51:48 +0000
parents 24d7981dec20
children b3274e6b88ef
comparison
equal deleted inserted replaced
14856:7b1198123519 14857:29a09f111b41
19 #endif 19 #endif
20 #ifdef HAVE_DIRECTFB 20 #ifdef HAVE_DIRECTFB
21 #if DIRECTFBVERSION > 912 21 #if DIRECTFBVERSION > 912
22 extern char *dfb_params; 22 extern char *dfb_params;
23 #endif 23 #endif
24 #endif
25 #ifdef HAVE_SDL
26 //extern char *sdl_driver;
27 extern int sdl_noxv;
28 extern int sdl_forcexv;
29 //extern char *sdl_adriver;
30 #endif 24 #endif
31 #ifdef USE_FAKE_MONO 25 #ifdef USE_FAKE_MONO
32 extern int fakemono; // defined in dec_audio.c 26 extern int fakemono; // defined in dec_audio.c
33 #endif 27 #endif
34 28
197 #ifdef HAVE_JPEG 191 #ifdef HAVE_JPEG
198 {"jpeg", "-jpeg is deprecated. Use -vo jpeg:options instead.\n", 192 {"jpeg", "-jpeg is deprecated. Use -vo jpeg:options instead.\n",
199 CONF_TYPE_PRINT, 0, 0, 0, NULL}, 193 CONF_TYPE_PRINT, 0, 0, 0, NULL},
200 #endif 194 #endif
201 // -vo sdl only: 195 // -vo sdl only:
202 #ifdef HAVE_SDL 196 {"sdl", "Use -vo sdl:driver=<driver> instead of -vo sdl -sdl driver.\n",
203 {"sdl", "Use -vo sdl:driver instead of -vo sdl -sdl driver.\n",
204 CONF_TYPE_PRINT, 0, 0, 0, NULL}, 197 CONF_TYPE_PRINT, 0, 0, 0, NULL},
205 {"noxv", &sdl_noxv, CONF_TYPE_FLAG, 0, 0, 1, NULL}, 198 {"noxv", "-noxv is deprecated. Use -vo sdl:nohwaccel instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
206 {"forcexv", &sdl_forcexv, CONF_TYPE_FLAG, 0, 0, 1, NULL}, 199 {"forcexv", "-forcexv is deprecated. Use -vo sdl:forcexv instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
207 // -ao sdl only: 200 // -ao sdl only:
208 {"sdla", "Use -ao sdl:driver instead of -ao sdl -sdla driver.\n", 201 {"sdla", "Use -ao sdl:driver instead of -ao sdl -sdla driver.\n",
209 CONF_TYPE_PRINT, 0, 0, 0, NULL}, 202 CONF_TYPE_PRINT, 0, 0, 0, NULL},
210 #endif
211 203
212 #if defined(HAVE_FBDEV)||defined(HAVE_VESA) 204 #if defined(HAVE_FBDEV)||defined(HAVE_VESA)
213 {"monitor-hfreq", &monitor_hfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, 205 {"monitor-hfreq", &monitor_hfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL},
214 {"monitor-vfreq", &monitor_vfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, 206 {"monitor-vfreq", &monitor_vfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL},
215 {"monitor-dotclock", &monitor_dotclock_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, 207 {"monitor-dotclock", &monitor_dotclock_str, CONF_TYPE_STRING, 0, 0, 0, NULL},