diff options
| author | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-19 16:59:59 +0000 |
|---|---|---|
| committer | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-19 16:59:59 +0000 |
| commit | 679844e497f3bd84c0c67cb834cd0675fe1936e3 (patch) | |
| tree | a4970824e49086ab85ef850383356537e95e595a | |
| parent | c8f1194dda04074a959712d878f9dc7c3333f99b (diff) | |
| download | mpv-679844e497f3bd84c0c67cb834cd0675fe1936e3.tar.bz2 mpv-679844e497f3bd84c0c67cb834cd0675fe1936e3.tar.xz | |
Added reverting support for -aa* -zr* -pp and -npp options
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4257 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | cfg-common.h | 4 | ||||
| -rw-r--r-- | cfg-mencoder.h | 2 | ||||
| -rw-r--r-- | cfg-mplayer.h | 8 |
3 files changed, 10 insertions, 4 deletions
diff --git a/cfg-common.h b/cfg-common.h index a204ad9b73..f45af2cffc 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -68,8 +68,8 @@ {"divxq", "Option -divxq has been renamed to -pp (postprocessing), use -pp !\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, - {"pp", &divx_quality, CONF_TYPE_INT, CONF_MIN, 0, 63, NULL}, - {"npp", readPPOpt, CONF_TYPE_FUNC_PARAM, 0, 0, 0, NULL}, + {"pp", readPPOpt, CONF_TYPE_FUNC_PARAM, 0, 0, 0, (cfg_default_func_t)&revertPPOpt}, + {"npp", readNPPOpt, CONF_TYPE_FUNC_PARAM, 0, 0, 0, (cfg_default_func_t)&revertPPOpt}, #ifdef HAVE_ODIVX_POSTPROCESS {"oldpp", &use_old_pp, CONF_TYPE_FLAG, 0, 0, 1, NULL}, #else diff --git a/cfg-mencoder.h b/cfg-mencoder.h index 891da64a88..0afaaff25b 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -13,6 +13,8 @@ extern int use_old_pp; extern int sws_flags; extern int readPPOpt(void *, char *arg); +extern int readNPPOpt(void *conf, char *arg); +extern void revertPPOpt(void *conf, char* opt); #ifdef HAVE_DIVX4ENCORE struct config divx4opts_conf[]={ diff --git a/cfg-mplayer.h b/cfg-mplayer.h index bc55fec416..79ac188856 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -71,10 +71,12 @@ extern int WinID; #ifdef HAVE_AA extern int vo_aa_parseoption(struct config * conf, char *opt, char * param); +extern void vo_aa_revertoption(config_t* opt,char* param); #endif #ifdef HAVE_ZR extern int vo_zr_parseoption(struct config * conf, char *opt, char * param); +extern void vo_zr_revertoption(config_t* opt,char* pram); #endif #ifdef HAVE_NEW_GUI @@ -106,6 +108,8 @@ struct config ao_plugin_conf[]={ extern int sws_flags; extern int readPPOpt(void *conf, char *arg); +extern int readNPPOpt(void *conf, char *arg); +extern void revertPPOpt(void *conf, char* opt); /* @@ -255,11 +259,11 @@ static config_t mplayer_opts[]={ #endif #ifdef HAVE_AA - {"aa*", vo_aa_parseoption, CONF_TYPE_FUNC_FULL, 0, 0, 0 , NULL}, + {"aa*", vo_aa_parseoption, CONF_TYPE_FUNC_FULL, 0, 0, 0 , &vo_aa_revertoption}, #endif #ifdef HAVE_ZR - {"zr*", vo_zr_parseoption, CONF_TYPE_FUNC_FULL, 0, 0, 0 }, + {"zr*", vo_zr_parseoption, CONF_TYPE_FUNC_FULL, 0, 0, 0, &vo_zr_revertoption }, #endif #ifdef HAVE_LIRC |