diff options
| -rw-r--r-- | cfg-common.h | 5 | ||||
| -rw-r--r-- | cfg-mencoder.h | 6 | ||||
| -rw-r--r-- | cfg-mplayer.h | 5 |
3 files changed, 5 insertions, 11 deletions
diff --git a/cfg-common.h b/cfg-common.h index e89bee0122..e913141c0a 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -183,6 +183,10 @@ {"noflip", &flip, CONF_TYPE_FLAG, 0, -1, 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 {"lavdopts", lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #endif @@ -244,6 +248,7 @@ extern float screen_size_xy; extern float movie_aspect; extern int softzoom; extern int flip; +extern int vd_use_slices; /* from dec_audio, currently used for ac3surround decoder only */ extern int audio_output_channels; diff --git a/cfg-mencoder.h b/cfg-mencoder.h index db62791bc7..cb039cebc4 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -147,8 +147,6 @@ struct config of_conf[]={ {NULL, NULL, 0, 0, 0, 0, NULL} }; -extern int vd_use_slices; - static config_t mencoder_opts[]={ /* name, pointer, type, flags, min, max */ {"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}, {"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}, {"noautoexpand", &auto_expand, CONF_TYPE_FLAG, 0, 1, 0, NULL}, diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 1f46319cf6..08c93e7281 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -56,7 +56,6 @@ extern int vo_vsync; extern int vo_fsmode; extern int vo_dbpp; extern int vo_directrendering; -extern int vd_use_slices; extern float vo_panscan; /* only used by startup (setting these values from configfile) */ 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_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 // -vo aa {"aa*", vo_aa_parseoption, CONF_TYPE_FUNC_FULL, 0, 0, 0 , &vo_aa_revertoption}, |