--- trunk/xvidcore/vfw/src/codec.c 2004/04/02 21:29:21 1398 +++ trunk/xvidcore/vfw/src/codec.c 2004/04/18 07:55:11 1437 @@ -348,24 +348,6 @@ return 0; } -static int exit_dll(CODEC* codec) -{ - if(codec->m_hdll) - { - FreeLibrary(codec->m_hdll); - codec->m_hdll = NULL; - codec->xvid_global_func = NULL; - codec->xvid_encore_func = NULL; - codec->xvid_decore_func = NULL; - codec->xvid_plugin_single_func = NULL; - codec->xvid_plugin_2pass1_func = NULL; - codec->xvid_plugin_2pass2_func = NULL; - codec->xvid_plugin_lumimasking_func = NULL; - codec->xvid_plugin_psnr_func = NULL; - } - return 0; -} - /* constant-quant zones for fixed quant encoding */ static void prepare_cquant_zones(CONFIG * config) { @@ -626,7 +608,6 @@ codec->xvid_encore_func(codec->ehandle, XVID_ENC_DESTROY, NULL, NULL); codec->ehandle = NULL; } - exit_dll(codec); } if (codec->config.display_status) @@ -1000,7 +981,8 @@ REG_GET_N("Brightness", pp_brightness, 0); REG_GET_N("Deblock_Y", pp_dy, 0) REG_GET_N("Deblock_UV", pp_duv, 0) - REG_GET_N("Dering", pp_dr, 0) + REG_GET_N("Dering_Y", pp_dry, 0) + REG_GET_N("Dering_UV", pp_druv, 0) REG_GET_N("FilmEffect", pp_fe, 0) RegCloseKey(hKey); @@ -1016,7 +998,6 @@ codec->xvid_decore_func(codec->dhandle, XVID_DEC_DESTROY, NULL, NULL); codec->dhandle = NULL; } - exit_dll(codec); } return ICERR_OK; @@ -1096,7 +1077,8 @@ if (pp_dy)frame.general |= XVID_DEBLOCKY; if (pp_duv) frame.general |= XVID_DEBLOCKUV; -/* if (pp_dr) frame.general |= XVID_DERING; */ + if (pp_dry) frame.general |= XVID_DERINGY; + if (pp_druv) frame.general |= XVID_DERINGUV; if (pp_fe) frame.general |= XVID_FILMEFFECT; frame.brightness = pp_brightness;