summaryrefslogtreecommitdiff
path: root/gst
diff options
context:
space:
mode:
authorVíctor Manuel Jáquez Leal <vjaquez@igalia.com>2018-10-31 19:20:20 +0100
committerVíctor Manuel Jáquez Leal <vjaquez@igalia.com>2018-10-31 19:22:35 +0100
commit2e6e4cce0b682d6e81b30f7b395bcdcec7e514e5 (patch)
tree61ed301b2353f9a74c0ab0f5a644bd8fbc8b2f52 /gst
parent9cae8f60308cd98163026668bbb9824779845f23 (diff)
downloadgstreamer-plugins-bad-2e6e4cce0b682d6e81b30f7b395bcdcec7e514e5.tar.gz
compositor: Fix enum type mismatch
The variable blend_mode is GstCompositorBlendMode but it is assigned to a GstCompositorOperator enum value.
Diffstat (limited to 'gst')
-rw-r--r--gst/compositor/compositor.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gst/compositor/compositor.c b/gst/compositor/compositor.c
index 453a92e8f..3f43efebb 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 ();