RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-25 04:38:01 +00:00
Code Issues Releases Wiki Activity

Moved -slices to cfg-common.h.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10563 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2003-08-11 01:38:50 +00:00
parent 2cc682bbc3
commit cbb29a709a
3 changed files with 5 additions and 11 deletions

5
cfg-common.h
View File

@ -183,6 +183,10 @@
{"noflip", &flip, CONF_TYPE_FLAG, 0, -1, 0, NULL}, {"noflip", &flip, CONF_TYPE_FLAG, 0, -1, 0, NULL},
{"tsfastparse", &ts_fastparse, CONF_TYPE_INT, 0, 0, 0, NULL}, {"tsfastparse", &ts_fastparse, CONF_TYPE_INT, 0, 0, 0, NULL},
// draw by slices or whole frame (useful with libmpeg2/libavcodec)
{"slices", &vd_use_slices, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"noslices", &vd_use_slices, CONF_TYPE_FLAG, 0, 1, 0, NULL},
#ifdef USE_LIBAVCODEC #ifdef USE_LIBAVCODEC
{"lavdopts", lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, {"lavdopts", lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
#endif #endif
@ -244,6 +248,7 @@ extern float screen_size_xy;
extern float movie_aspect; extern float movie_aspect;
extern int softzoom; extern int softzoom;
extern int flip; extern int flip;
extern int vd_use_slices;
/* from dec_audio, currently used for ac3surround decoder only */ /* from dec_audio, currently used for ac3surround decoder only */
extern int audio_output_channels; extern int audio_output_channels;

6
cfg-mencoder.h
View File

@ -147,8 +147,6 @@ struct config of_conf[]={
{NULL, NULL, 0, 0, 0, 0, NULL} {NULL, NULL, 0, 0, 0, 0, NULL}
}; };
extern int vd_use_slices;
static config_t mencoder_opts[]={ static config_t mencoder_opts[]={
/* name, pointer, type, flags, min, max */ /* name, pointer, type, flags, min, max */
{"include", cfg_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, NULL}, /* this must be the first!!! */ {"include", cfg_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, NULL}, /* this must be the first!!! */
@ -189,10 +187,6 @@ static config_t mencoder_opts[]={
{"vobsuboutindex", &vobsub_out_index, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL}, {"vobsuboutindex", &vobsub_out_index, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL},
{"vobsuboutid", &vobsub_out_id, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"vobsuboutid", &vobsub_out_id, CONF_TYPE_STRING, 0, 0, 0, NULL},
// draw by slices or whole frame (usefull with libmpeg2/libavcodec)
{"slices", &vd_use_slices, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"noslices", &vd_use_slices, CONF_TYPE_FLAG, 0, 1, 0, NULL},
{"autoexpand", &auto_expand, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"autoexpand", &auto_expand, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"noautoexpand", &auto_expand, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"noautoexpand", &auto_expand, CONF_TYPE_FLAG, 0, 1, 0, NULL},

5
cfg-mplayer.h
View File

@ -56,7 +56,6 @@ extern int vo_vsync;
extern int vo_fsmode; extern int vo_fsmode;
extern int vo_dbpp; extern int vo_dbpp;
extern int vo_directrendering; extern int vo_directrendering;
extern int vd_use_slices;
extern float vo_panscan; extern float vo_panscan;
/* only used by startup (setting these values from configfile) */ /* only used by startup (setting these values from configfile) */
extern int vo_gamma_brightness; extern int vo_gamma_brightness;
@ -309,10 +308,6 @@ static config_t mplayer_opts[]={
{"vaa_dr", "Use -dr, -vaa_dr was obsoleted\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, {"vaa_dr", "Use -dr, -vaa_dr was obsoleted\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
{"vaa_nodr", "Use -nodr, -vaa_nodr was obsoleted\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, {"vaa_nodr", "Use -nodr, -vaa_nodr was obsoleted\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
// draw by slices or whole frame (usefull with libmpeg2/libavcodec)
{"slices", &vd_use_slices, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"noslices", &vd_use_slices, CONF_TYPE_FLAG, 0, 1, 0, NULL},
#ifdef HAVE_AA #ifdef HAVE_AA
// -vo aa // -vo aa
{"aa*", vo_aa_parseoption, CONF_TYPE_FUNC_FULL, 0, 0, 0 , &vo_aa_revertoption}, {"aa*", vo_aa_parseoption, CONF_TYPE_FUNC_FULL, 0, 0, 0 , &vo_aa_revertoption},