projects
/
platform
/
upstream
/
gstreamer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gstfunnel: avoid access of freed pad
[platform/upstream/gstreamer.git]
/
gst
/
gstbus.h
diff --git
a/gst/gstbus.h
b/gst/gstbus.h
index
732591f
..
2dbf0ce
100644
(file)
--- a/
gst/gstbus.h
+++ b/
gst/gstbus.h
@@
-28,7
+28,6
@@
typedef struct _GstBusClass GstBusClass;
#include <gst/gstmessage.h>
#include <gst/gstclock.h>
#include <gst/gstmessage.h>
#include <gst/gstclock.h>
-#include <gst/gstatomicqueue.h>
G_BEGIN_DECLS
G_BEGIN_DECLS
@@
-116,18
+115,9
@@
struct _GstBus
GstObject object;
/*< private >*/
GstObject object;
/*< private >*/
- GstAtomicQueue *queue;
- GMutex *queue_lock;
-
- GstBusSyncHandler sync_handler;
- gpointer sync_handler_data;
-
- guint signal_watch_id;
- guint num_signal_watchers;
-
- /*< private >*/
GstBusPrivate *priv;
GstBusPrivate *priv;
- gpointer _gst_reserved[GST_PADDING - 1];
+
+ gpointer _gst_reserved[GST_PADDING];
};
struct _GstBusClass
};
struct _GstBusClass
@@
-172,7
+162,7
@@
guint gst_bus_add_watch (GstBus * bus,
/* polling the bus */
GstMessage* gst_bus_poll (GstBus *bus, GstMessageType events,
/* polling the bus */
GstMessage* gst_bus_poll (GstBus *bus, GstMessageType events,
- GstClockTime
Diff
timeout);
+ GstClockTime timeout);
/* signal based dispatching helper functions. */
gboolean gst_bus_async_signal_func (GstBus *bus, GstMessage *message,
/* signal based dispatching helper functions. */
gboolean gst_bus_async_signal_func (GstBus *bus, GstMessage *message,