From 2e6e4cce0b682d6e81b30f7b395bcdcec7e514e5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= Date: Wed, 31 Oct 2018 19:20:20 +0100 Subject: [PATCH] compositor: Fix enum type mismatch The variable blend_mode is GstCompositorBlendMode but it is assigned to a GstCompositorOperator enum value. --- gst/compositor/compositor.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gst/compositor/compositor.c b/gst/compositor/compositor.c index 453a92e..3f43efe 100644 --- a/gst/compositor/compositor.c +++ b/gst/compositor/compositor.c @@ -892,13 +892,13 @@ gst_compositor_aggregate_frames (GstVideoAggregator * vagg, GstBuffer * outbuf) switch (compo_pad->op) { case COMPOSITOR_OPERATOR_SOURCE: - blend_mode = COMPOSITOR_OPERATOR_SOURCE; + blend_mode = COMPOSITOR_BLEND_MODE_SOURCE; break; case COMPOSITOR_OPERATOR_OVER: - blend_mode = COMPOSITOR_OPERATOR_OVER; + blend_mode = COMPOSITOR_BLEND_MODE_OVER; break; case COMPOSITOR_OPERATOR_ADD: - blend_mode = COMPOSITOR_OPERATOR_ADD; + blend_mode = COMPOSITOR_BLEND_MODE_ADD; break; default: g_assert_not_reached (); -- 2.7.4