diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2011-05-16 16:53:04 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2011-05-16 16:53:04 +0200 |
| commit | b935a814d949f71b1d5968d3f87ce365381fdb95 (patch) | |
| tree | 09e08df568b875051908b43b36ac5bc698974bce /gst/gst_private.h | |
| parent | 6bff1f968a61a32141f27cfda20e25c0af24cfd7 (diff) | |
| parent | fe1dcbe6fa1625ae83980f4da813f0f3764e7d51 (diff) | |
Merge branch 'master' into 0.11
Conflicts:
configure.ac
docs/gst/gstreamer-sections.txt
gst/gstbin.c
gst/gstelement.c
gst/gstelement.h
gst/gstghostpad.c
gst/gstminiobject.c
gst/gstminiobject.h
libs/gst/base/gstbasesrc.c
libs/gst/base/gstbasetransform.c
plugins/elements/gstinputselector.c
tests/check/gst/gstminiobject.c
Diffstat (limited to 'gst/gst_private.h')
| -rw-r--r-- | gst/gst_private.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/gst/gst_private.h b/gst/gst_private.h index cf0d152ff..13f259089 100644 --- a/gst/gst_private.h +++ b/gst/gst_private.h @@ -51,6 +51,9 @@ extern const char g_log_domain_gstreamer[]; /* for the pad cache */ #include "gstpad.h" +/* for GstElement */ +#include "gstelement.h" + G_BEGIN_DECLS /* used by gstparse.c and grammar.y */ @@ -115,6 +118,10 @@ gboolean _gst_plugin_loader_client_run (void); void _priv_gst_pad_invalidate_cache (GstPad *pad); +/* Used in GstBin for manual state handling */ +void _priv_gst_element_state_changed (GstElement *element, GstState oldstate, + GstState newstate, GstState pending); + /* used in both gststructure.c and gstcaps.c; numbers are completely made up */ #define STRUCTURE_ESTIMATED_STRING_LEN(s) (16 + gst_structure_n_fields(s) * 22) |