From e7659aeecd9a95ec928fe0063769ff1256bc4763 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Wed, 18 May 2011 14:59:45 +0300 Subject: [PATCH 1/4] manual: put generated sources to BUILT_SOURCES and clean them on make clean --- tests/examples/manual/Makefile.am | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) 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) From 79b22cb2ed390bdf001f919ee9e7518f2c259526 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Wed, 18 May 2011 15:02:02 +0300 Subject: [PATCH 2/4] docs: use the same name for the argument in prototype and docs --- gst/gstghostpad.h | 2 +- gst/gstminiobject.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gst/gstghostpad.h b/gst/gstghostpad.h index 4184e9fb87..308ab70cb6 100644 --- a/gst/gstghostpad.h +++ b/gst/gstghostpad.h @@ -67,7 +67,7 @@ gboolean gst_proxy_pad_event_default (GstPad *pad, G gboolean gst_proxy_pad_query_default (GstPad *pad, GstQuery *query); GstIterator* gst_proxy_pad_iterate_internal_links_default (GstPad *pad); GstFlowReturn gst_proxy_pad_bufferalloc_default (GstPad *pad, guint64 offset, guint size, GstCaps *caps, GstBuffer **buf); -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 bbb4c30c5b..3993e02a71 100644 --- a/gst/gstminiobject.c +++ b/gst/gstminiobject.c @@ -414,7 +414,7 @@ gst_mini_object_unref (GstMiniObject * mini_object) /** * 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 * @@ -475,7 +475,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 * From bc9e72d4ed2a63eaac7189e677aa92d07e2f093d Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Wed, 18 May 2011 15:04:48 +0300 Subject: [PATCH 3/4] docs: remove GstProxyPad from private section --- docs/gst/gstreamer-sections.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt index 9639bbaa23..0999c5ed31 100644 --- a/docs/gst/gstreamer-sections.txt +++ b/docs/gst/gstreamer-sections.txt @@ -955,7 +955,6 @@ GST_PROXY_PAD GST_PROXY_PAD_CLASS GST_TYPE_PROXY_PAD GstGhostPadPrivate -GstProxyPad GstProxyPadClass GstProxyPadPrivate gst_proxy_pad_get_type From b592d038d3e3068c0e8678281bf5b20996fd7c27 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Wed, 18 May 2011 16:09:19 +0300 Subject: [PATCH 4/4] Automatic update of common submodule From fd35073 to 9e5bbd5 --- common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common b/common index fd3507359e..9e5bbd5085 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit fd3507359e845119d199b348c7779b987cee1c45 +Subproject commit 9e5bbd508588961696e70c38e764492e0312ec4c