diff --git a/common b/common index fd3507359e..9e5bbd5085 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit fd3507359e845119d199b348c7779b987cee1c45 +Subproject commit 9e5bbd508588961696e70c38e764492e0312ec4c diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt index 94ceb3b203..7ed6dc2f21 100644 --- a/docs/gst/gstreamer-sections.txt +++ b/docs/gst/gstreamer-sections.txt @@ -985,7 +985,6 @@ GST_PROXY_PAD GST_PROXY_PAD_CLASS GST_TYPE_PROXY_PAD GstGhostPadPrivate -GstProxyPad GstProxyPadClass GstProxyPadPrivate gst_proxy_pad_get_type diff --git a/gst/gstghostpad.h b/gst/gstghostpad.h index f1afb4117a..3225e2aa1f 100644 --- a/gst/gstghostpad.h +++ b/gst/gstghostpad.h @@ -66,7 +66,7 @@ const GstQueryType* gst_proxy_pad_query_type_default (GstPad *pad); gboolean gst_proxy_pad_event_default (GstPad *pad, GstEvent *event); gboolean gst_proxy_pad_query_default (GstPad *pad, GstQuery *query); GstIterator* gst_proxy_pad_iterate_internal_links_default (GstPad *pad); -GstFlowReturn gst_proxy_pad_chain_default (GstPad *pad, GstBuffer *buf); +GstFlowReturn gst_proxy_pad_chain_default (GstPad *pad, GstBuffer *buffer); GstFlowReturn gst_proxy_pad_chain_list_default (GstPad *pad, GstBufferList *list); GstFlowReturn gst_proxy_pad_getrange_default (GstPad *pad, guint64 offset, guint size, GstBuffer **buffer); gboolean gst_proxy_pad_checkgetrange_default (GstPad *pad); diff --git a/gst/gstminiobject.c b/gst/gstminiobject.c index 198325e4cf..a6eb48fb63 100644 --- a/gst/gstminiobject.c +++ b/gst/gstminiobject.c @@ -318,7 +318,7 @@ gst_mini_object_replace (GstMiniObject ** olddata, GstMiniObject * newdata) /** * gst_mini_object_weak_ref: (skip) - * @mini_object: #GstMiniObject to reference weakly + * @object: #GstMiniObject to reference weakly * @notify: callback to invoke before the mini object is freed * @data: extra data to pass to notify * @@ -370,7 +370,7 @@ found: /** * gst_mini_object_weak_unref: (skip) - * @mini_object: #GstMiniObject to remove a weak reference from + * @object: #GstMiniObject to remove a weak reference from * @notify: callback to search for * @data: data to search for * diff --git a/tests/examples/manual/Makefile.am b/tests/examples/manual/Makefile.am index 9a70c2a883..d06e0d6a69 100644 --- a/tests/examples/manual/Makefile.am +++ b/tests/examples/manual/Makefile.am @@ -18,8 +18,6 @@ TESTS_ENVIRONMENT = \ GST_PLUGIN_SYSTEM_PATH= \ GST_PLUGIN_PATH=$(top_builddir)/plugins -CLEANFILES = core core.* test-registry.* *.gcno *.gcda - EXTRA_DIST = extract.pl EXAMPLES = \ @@ -42,6 +40,20 @@ EXAMPLES = \ decodebin \ $(GST_LOADSAVE_SRC) +BUILT_SOURCES = \ + elementmake.c elementcreate.c elementget.c elementlink.c elementfactory.c \ + bin.c \ + pad.c ghostpad.c \ + gnome.c \ + helloworld.c \ + init.c \ + query.c \ + typefind.c dynamic.c \ + fakesrc.c \ + playbin.c decodebin.c + +CLEANFILES = core core.* test-registry.* *.gcno *.gcda $(BUILT_SOURCES) + AM_CFLAGS = $(GST_OBJ_CFLAGS) LDADD = $(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \ $(GST_OBJ_LIBS)