summaryrefslogtreecommitdiff
path: root/gst/videomixer/videomixer2.h
diff options
context:
space:
mode:
authorMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>2012-04-17 15:14:27 +0200
committerMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>2012-04-17 15:14:27 +0200
commit67e168aef4ca240cb27cf8e21f3b6822d98c42c8 (patch)
tree1409afdffdfefa67e686c0f609a726bb81dd27ff /gst/videomixer/videomixer2.h
parent04b4d30f2cf7f8196703e14647cbb88b7ec1ad37 (diff)
collectpads2: rename to collectpads
Diffstat (limited to 'gst/videomixer/videomixer2.h')
-rw-r--r--gst/videomixer/videomixer2.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/gst/videomixer/videomixer2.h b/gst/videomixer/videomixer2.h
index 02f7d11eb..5f4af2e00 100644
--- a/gst/videomixer/videomixer2.h
+++ b/gst/videomixer/videomixer2.h
@@ -25,7 +25,7 @@
#include <gst/video/video.h>
#include "blend.h"
-#include <gst/base/gstcollectpads2.h>
+#include <gst/base/gstcollectpads.h>
G_BEGIN_DECLS
@@ -77,7 +77,7 @@ struct _GstVideoMixer2
/* Lock to prevent the state to change while blending */
GMutex lock;
/* Sink pads using Collect Pads 2*/
- GstCollectPads2 *collect;
+ GstCollectPads *collect;
/* sinkpads, a GSList of GstVideoMixer2Pads */
GSList *sinkpads;