Merge branch 'master' into 0.11

[platform/upstream/gstreamer.git] / gst / matroska / matroska-mux.h

diff --git a/gst/matroska/matroska-mux.h b/gst/matroska/matroska-mux.h
index 4377f26..da9a3e7 100644 (file)
--- a/gst/matroska/matroska-mux.h
+++ b/gst/matroska/matroska-mux.h
@@ -24,7 +24,7 @@
 #define __GST_MATROSKA_MUX_H__
 
 #include <gst/gst.h>
-#include <gst/base/gstcollectpads.h>
+#include <gst/base/gstcollectpads2.h>
 
 #include "ebml-write.h"
 #include "matroska-ids.h"
@@ -58,12 +58,10 @@ typedef gboolean (*GstMatroskaCapsFunc) (GstPad *pad, GstCaps *caps);
 /* all information needed for one matroska stream */
 typedef struct
 {
-  GstCollectData collect;       /* we extend the CollectData */
+  GstCollectData2 collect;       /* we extend the CollectData */
   GstMatroskaCapsFunc capsfunc;
   GstMatroskaTrackContext *track;
 
-  GstBuffer *buffer;            /* the queued buffer for this pad */
-
   guint64 duration;
   GstClockTime start_ts;
   GstClockTime end_ts;    /* last timestamp + (if available) duration */
@@ -79,8 +77,7 @@ typedef struct _GstMatroskaMux {
 
   /* pads */
   GstPad        *srcpad;
-  GstCollectPads *collect;
-  GstPadEventFunction collect_event;
+  GstCollectPads2 *collect;
   GstEbmlWrite *ebml_write;
 
   guint          num_streams,