From e479f2bb26dee3dd7a87bbb9557bd0a130979e85 Mon Sep 17 00:00:00 2001 From: alex Date: Sun, 31 Aug 2003 22:18:27 +0000 Subject: remove read/revert hack git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10757 b3059339-0415-0410-9bf9-f77b7e298cf2 --- cfg-common.h | 3 ++- libmpcodecs/vf_pp.c | 25 +------------------------ 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/cfg-common.h b/cfg-common.h index 5cc6c74771..6d2e404c8d 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -158,7 +158,7 @@ {"divxq", "Option -divxq has been renamed to -pp (postprocessing), use -pp !\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, #ifdef USE_LIBAVCODEC - {"pp", readPPOpt, CONF_TYPE_FUNC_PARAM, 0, 0, 0, (cfg_default_func_t)&revertPPOpt}, + {"pp", &divx_quality, CONF_TYPE_INT, 0, 0, 0, NULL}, #endif #ifdef HAVE_ODIVX_POSTPROCESS {"oldpp", &use_old_pp, CONF_TYPE_FLAG, 0, 0, 1, NULL}, @@ -260,6 +260,7 @@ extern float movie_aspect; extern int softzoom; extern int flip; extern int vd_use_slices; +extern int divx_quality; /* from dec_audio, currently used for ac3surround decoder only */ extern int audio_output_channels; diff --git a/libmpcodecs/vf_pp.c b/libmpcodecs/vf_pp.c index 36c021284e..6131670613 100644 --- a/libmpcodecs/vf_pp.c +++ b/libmpcodecs/vf_pp.c @@ -210,33 +210,10 @@ static int open(vf_instance_t *vf, char* args){ } #endif - vf->priv->pp=PP_QUALITY_MAX; //divx_quality; + vf->priv->pp=PP_QUALITY_MAX; return 1; } -int readPPOpt(void *conf, char *arg) -{ - int val; - - if(arg == NULL) - return -2; // ERR_MISSING_PARAM - errno = 0; - val = (int)strtol(arg,NULL,0); - if(errno != 0) - return -4; // What about include cfgparser.h and use ERR_* defines */ - if(val < 0) - return -3; // ERR_OUT_OF_RANGE - - divx_quality = val; - - return 1; -} - -void revertPPOpt(void *conf, char* opt) -{ - divx_quality=0; -} - vf_info_t vf_info_pp = { "postprocessing", "pp", -- cgit v1.2.3