[vlc-devel] [PATCH 03/12] video_filter:deinterlace: make sure we use the same setup for auto and X

[Steve Lhomme]

--
replaces https://patches.videolan.org/patch/17094/
- fallback to X mode rather than merging it with auto
---
 modules/video_filter/deinterlace/deinterlace.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/modules/video_filter/deinterlace/deinterlace.c b/modules/video_filter/deinterlace/deinterlace.c
index 2be5422c3a..541e87e55d 100644
--- a/modules/video_filter/deinterlace/deinterlace.c
+++ b/modules/video_filter/deinterlace/deinterlace.c
@@ -148,18 +148,14 @@ static void SetFilterMethod( filter_t *p_filter, const char *mode, bool pack )
 {
     filter_sys_t *p_sys = p_filter->p_sys;
 
-    if ( mode == NULL )
-        mode = "auto";
+    if ( mode == NULL || !strcmp( mode, "auto" ) )
+        mode = "x";
 
     p_sys->b_double_rate = false;
     p_sys->b_half_height = false;
     p_sys->b_use_frame_history = false;
 
-    if ( !strcmp( mode, "auto" ) )
-    {
-        p_sys->i_mode = DEINTERLACE_X;
-    }
-    else if( !strcmp( mode, "discard" ) )
+    if( !strcmp( mode, "discard" ) )
     {
         p_sys->i_mode = DEINTERLACE_DISCARD;
         p_sys->b_half_height = true;
-- 
2.12.1