mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 03:35:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

videoaggregator: drop ABI compat in padding for new struct member

Browse source 
Don't really have to do that while it's in -bad and most users
are in-tree anyway.
This commit is contained in:
Tim-Philipp Müller 2017-11-02 11:57:24 +00:00
parent a9ffba8ce5
commit dd7a90c48e
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst-libs/gst/video/gstvideoaggregator.c
View file

@ -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

12
gst-libs/gst/video/gstvideoaggregatorpad.h
View file

@ -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];
};
/**

2
gst/compositor/compositor.c
View file

@ -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);