<html><head></head><body><div class="gmail_quote">Le 3 juillet 2017 10:47:29 GMT+03:00, Steve Lhomme <robux4@videolabs.io> a écrit :<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
<pre class="k9mail">We don't need it locally.<br />---<br /> modules/video_filter/deinterlace/deinterlace.c | 11 ++---------<br /> modules/video_filter/deinterlace/deinterlace.h | 14 --------------<br /> 2 files changed, 2 insertions(+), 23 deletions(-)<br /><br />diff --git a/modules/video_filter/deinterlace/deinterlace.c b/modules/video_filter/deinterlace/deinterlace.c<br />index d028834998..1784ed6461 100644<br />--- a/modules/video_filter/deinterlace/deinterlace.c<br />+++ b/modules/video_filter/deinterlace/deinterlace.c<br />@@ -53,9 +53,6 @@<br /> <br /> #define MODE_TEXT N_("Deinterlace mode")<br /> <br />-#define SOUT_MODE_TEXT N_("Streaming deinterlace mode")<br />-#define SOUT_MODE_LONGTEXT N_("Deinterlace method to use for streaming.")<br />-<br /> #define FILTER_CFG_PREFIX "sout-deinterlace-"<br /> <br /> /* Tooltips drop linefeeds (at least in the Qt GUI);<br />@@ -100,10 +97,6 @@ vlc_module_begin ()<br /> set_category( CAT_VIDEO )<br /> set_subcategory( SUBCAT_VIDEO_VFILTER )<br /> <br />- add_string( FILTER_CFG_PREFIX "mode", "blend", SOUT_MODE_TEXT,<br />- SOUT_MODE_LONGTEXT, false )<br />- change_string_list( mode_list, mode_list_text )<br />- change_safe ()<br /> add_integer( FILTER_CFG_PREFIX "phosphor-chroma", 2, PHOSPHOR_CHROMA_TEXT,<br /> PHOSPHOR_CHROMA_LONGTEXT, true )<br /> change_integer_list( phosphor_chroma_list, phosphor_chroma_list_text )<br />@@ -127,7 +120,7 @@ vlc_module_end ()<br /> * and reading logic for them implemented in Open().<br /> */<br /> static const char *const ppsz_filter_options[] = {<br />- "mode", "phosphor-chroma", "phosphor-dimmer",<br />+ "phosphor-chroma", "phosphor-dimmer",<br /> NULL<br /> };<br /> <br />@@ -320,7 +313,7 @@ notsupp:<br /> <br /> config_ChainParse( p_filter, FILTER_CFG_PREFIX, ppsz_filter_options,<br /> p_filter->p_cfg );<br />- char *psz_mode = var_InheritString( p_filter, FILTER_CFG_PREFIX "mode" );<br />+ char *psz_mode = var_InheritString( p_filter, "deinterlace-mode" );<br /> SetFilterMethod( p_filter, psz_mode, packed );<br /> <br /> InitDeinterlacingContext( &p_sys->context );<br />diff --git a/modules/video_filter/deinterlace/deinterlace.h b/modules/video_filter/deinterlace/deinterlace.h<br />index ecc26e0d60..8584a072b2 100644<br />--- a/modules/video_filter/deinterlace/deinterlace.h<br />+++ b/modules/video_filter/deinterlace/deinterlace.h<br />@@ -45,20 +45,6 @@ struct vlc_object_t;<br /> #include "common.h"<br /> <br /> /*****************************************************************************<br />- * Local data<br />- *****************************************************************************/<br />-<br />-/** Available deinterlace modes. */<br />-static const char *const mode_list[] = {<br />- "discard", "blend", "mean", "bob", "linear", "x",<br />- "yadif", "yadif2x", "phosphor", "ivtc" };<br />-<br />-/** User labels for the available deinterlace modes. */<br />-static const char *const mode_list_text[] = {<br />- N_("Discard"), N_("Blend"), N_("Mean"), N_("Bob"), N_("Linear"), "X",<br />- "Yadif", "Yadif (2x)", N_("Phosphor"), N_("Film NTSC (IVTC)") };<br />-<br />-/*****************************************************************************<br /> * Data structures<br /> *****************************************************************************/<br /> </pre></blockquote></div><br clear="all">Removing the setting from prefs does not seem right.<br>
-- <br>
Rémi Denis-Courmont<br>
Typed on an inconvenient virtual keyboard</body></html>