Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv16786 Modified Files: cfg-common.h cfg-mplayer.h cfg-mencoder.h Log Message: Added reverting support for -aa* -zr* -pp and -npp options Index: cfg-common.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-common.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- cfg-common.h 17 Jan 2002 20:24:28 -0000 1.22 +++ cfg-common.h 19 Jan 2002 16:59:59 -0000 1.23 @@ -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 Index: cfg-mplayer.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- cfg-mplayer.h 19 Jan 2002 08:18:09 -0000 1.125 +++ cfg-mplayer.h 19 Jan 2002 16:59:59 -0000 1.126 @@ -71,10 +71,12 @@ #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 @@ 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 @@ #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 Index: cfg-mencoder.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- cfg-mencoder.h 17 Jan 2002 01:02:41 -0000 1.21 +++ cfg-mencoder.h 19 Jan 2002 16:59:59 -0000 1.22 @@ -13,6 +13,8 @@ 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[]={