# HG changeset patch
# User albeu
# Date 1011459599 0
# Node ID bbaa26821fdf99405b1e3af437bd6988cf722c75
# Parent  5a4a4b272d108f0fb9eb7047c00429c957daa659
Added reverting support for -aa* -zr* -pp and -npp options

diff -r 5a4a4b272d10 -r bbaa26821fdf cfg-common.h
--- a/cfg-common.h	Sat Jan 19 16:58:33 2002 +0000
+++ b/cfg-common.h	Sat Jan 19 16:59:59 2002 +0000
@@ -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 -r 5a4a4b272d10 -r bbaa26821fdf cfg-mencoder.h
--- a/cfg-mencoder.h	Sat Jan 19 16:58:33 2002 +0000
+++ b/cfg-mencoder.h	Sat Jan 19 16:59:59 2002 +0000
@@ -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[]={
diff -r 5a4a4b272d10 -r bbaa26821fdf cfg-mplayer.h
--- a/cfg-mplayer.h	Sat Jan 19 16:58:33 2002 +0000
+++ b/cfg-mplayer.h	Sat Jan 19 16:59:59 2002 +0000
@@ -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