From dd7a90c48e088c1dd4f743effc53e03a3ae73fe7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Thu, 2 Nov 2017 11:57:24 +0000
Subject: [PATCH] videoaggregator: drop ABI compat in padding for new struct
 member

Don't really have to do that while it's in -bad and most users
are in-tree anyway.
---
 gst-libs/gst/video/gstvideoaggregator.c    |  2 +-
 gst-libs/gst/video/gstvideoaggregatorpad.h | 12 ++++++------
 gst/compositor/compositor.c                |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c
index dc86e84999..436c88a93d 100644
--- a/gst-libs/gst/video/gstvideoaggregator.c
+++ b/gst-libs/gst/video/gstvideoaggregator.c
@@ -521,7 +521,7 @@ gst_video_aggregator_find_best_format (GstVideoAggregator * vagg,
         GINT_TO_POINTER (format_number));
 
     /* If that pad is the first with alpha, set it as the new best format */
-    if (!need_alpha && (pad->ABI.needs_alpha
+    if (!need_alpha && (pad->needs_alpha
             && (!GST_VIDEO_FORMAT_INFO_HAS_ALPHA (pad->info.finfo)))) {
       need_alpha = TRUE;
       /* Just fallback to ARGB in case we require alpha but the input pad
diff --git a/gst-libs/gst/video/gstvideoaggregatorpad.h b/gst-libs/gst/video/gstvideoaggregatorpad.h
index c374731183..76d8d734e2 100644
--- a/gst-libs/gst/video/gstvideoaggregatorpad.h
+++ b/gst-libs/gst/video/gstvideoaggregatorpad.h
@@ -68,14 +68,14 @@ struct _GstVideoAggregatorPad
   guint zorder;
   gboolean ignore_eos;
 
+  /* Subclasses can force an alpha channel in the (input thus output)
+   * colorspace format */
+  gboolean needs_alpha;
+
   /* < private > */
   GstVideoAggregatorPadPrivate *priv;
-  union {
-    /* Subclasses can force an alpha channel in the (input thus output)
-     * colorspace format */
-    gboolean needs_alpha;
-    gpointer          _gst_reserved[GST_PADDING];
-  } ABI;
+
+  gpointer          _gst_reserved[GST_PADDING];
 };
 
 /**
diff --git a/gst/compositor/compositor.c b/gst/compositor/compositor.c
index 81744e34f0..c1954e2a69 100644
--- a/gst/compositor/compositor.c
+++ b/gst/compositor/compositor.c
@@ -195,7 +195,7 @@ gst_compositor_pad_set_property (GObject * object, guint prop_id,
       break;
     case PROP_PAD_CROSSFADE_RATIO:
       pad->crossfade = g_value_get_double (value);
-      GST_VIDEO_AGGREGATOR_PAD (pad)->ABI.needs_alpha = pad->crossfade >= 0.0f;
+      GST_VIDEO_AGGREGATOR_PAD (pad)->needs_alpha = pad->crossfade >= 0.0f;
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);