[vlc-devel] [PATCH 06/10] vout: move has_deint in the interlacing internal structure

[Steve Lhomme]

---
 src/video_output/interlacing.c   | 4 ++--
 src/video_output/video_output.c  | 4 ++--
 src/video_output/vout_internal.h | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/video_output/interlacing.c b/src/video_output/interlacing.c
index 01c87a80eba..9d06b8034e8 100644
--- a/src/video_output/interlacing.c
+++ b/src/video_output/interlacing.c
@@ -96,7 +96,7 @@ void vout_InitInterlacingSupport(vout_thread_t *vout)
 
     msg_Dbg(vout, "Deinterlacing available");
 
-    vout->p->filter.has_deint = false;
+    vout->p->interlacing.has_deint = false;
 
     /* Create the configuration variables */
     /* */
@@ -139,7 +139,7 @@ void vout_InitInterlacingSupport(vout_thread_t *vout)
 
     /* Override the initial value from filters if present */
     char *filter_mode = NULL;
-    if (vout->p->filter.has_deint)
+    if (vout->p->interlacing.has_deint)
         filter_mode = var_CreateGetNonEmptyString(vout, "sout-deinterlace-mode");
     if (filter_mode) {
         deinterlace_state = 1;
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index af12f6e7262..b183f6de3af 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -771,9 +771,9 @@ static void ThreadChangeFilters(vout_thread_t *vout,
     vlc_array_init(&array_interactive);
 
     if (new_deinterlace != NULL)
-        vout->p->filter.has_deint = *new_deinterlace;
+        vout->p->interlacing.has_deint = *new_deinterlace;
 
-    if (vout->p->filter.has_deint)
+    if (vout->p->interlacing.has_deint)
     {
         vout_filter_t *e = malloc(sizeof(*e));
 
diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h
index 7003ad83a1c..1ce5550db6f 100644
--- a/src/video_output/vout_internal.h
+++ b/src/video_output/vout_internal.h
@@ -145,6 +145,7 @@ struct vout_thread_sys_t
 
     struct {
         bool        is_interlaced;
+        bool        has_deint;
         vlc_tick_t  date;
     } interlacing;
 
@@ -159,7 +160,6 @@ struct vout_thread_sys_t
         vlc_video_context *src_vctx;
         struct filter_chain_t *chain_static;
         struct filter_chain_t *chain_interactive;
-        bool            has_deint;
     } filter;
 
     /* */
-- 
2.26.2