[vlc-commits] deinterlace: use a union to store phosphor and ivtc parameters

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at videolabs.io> | Mon Jun 26 14:58:21 2017 +0200| [f3f94cee6d538c7a8f04948b5401b77758e39096] | committer: Jean-Baptiste Kempf

deinterlace: use a union to store phosphor and ivtc parameters

Since they are mutually exclusive

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f3f94cee6d538c7a8f04948b5401b77758e39096
---

 modules/video_filter/deinterlace/deinterlace.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/video_filter/deinterlace/deinterlace.h b/modules/video_filter/deinterlace/deinterlace.h
index 93ae1d255b..00fddb74ec 100644
--- a/modules/video_filter/deinterlace/deinterlace.h
+++ b/modules/video_filter/deinterlace/deinterlace.h
@@ -119,8 +119,10 @@ struct filter_sys_t
     picture_t *pp_history[HISTORY_SIZE];
 
     /* Algorithm-specific substructures */
-    phosphor_sys_t phosphor; /**< Phosphor algorithm state. */
-    ivtc_sys_t ivtc;         /**< IVTC algorithm state. */
+    union {
+        phosphor_sys_t phosphor; /**< Phosphor algorithm state. */
+        ivtc_sys_t ivtc;         /**< IVTC algorithm state. */
+    };
 };
 
 /*****************************************************************************