mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 06:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source 
Conflicts:
	gst/gstghostpad.h
This commit is contained in:
Wim Taymans 2011-05-19 11:30:06 +02:00
commit 4a646e0e76
5 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common

@ -1 +1 @@
Subproject commit fd3507359e845119d199b348c7779b987cee1c45 Subproject commit 9e5bbd508588961696e70c38e764492e0312ec4c

1
docs/gst/gstreamer-sections.txt
View file

@ -985,7 +985,6 @@ GST_PROXY_PAD
GST_PROXY_PAD_CLASS GST_PROXY_PAD_CLASS
GST_TYPE_PROXY_PAD GST_TYPE_PROXY_PAD
GstGhostPadPrivate GstGhostPadPrivate
GstProxyPad
GstProxyPadClass GstProxyPadClass
GstProxyPadPrivate GstProxyPadPrivate
gst_proxy_pad_get_type gst_proxy_pad_get_type

2
gst/gstghostpad.h
View file

@ -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_event_default (GstPad *pad, GstEvent *event);
gboolean gst_proxy_pad_query_default (GstPad *pad, GstQuery *query); gboolean gst_proxy_pad_query_default (GstPad *pad, GstQuery *query);
GstIterator* gst_proxy_pad_iterate_internal_links_default (GstPad *pad); 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_chain_list_default (GstPad *pad, GstBufferList *list);
GstFlowReturn gst_proxy_pad_getrange_default (GstPad *pad, guint64 offset, guint size, GstBuffer **buffer); GstFlowReturn gst_proxy_pad_getrange_default (GstPad *pad, guint64 offset, guint size, GstBuffer **buffer);
gboolean gst_proxy_pad_checkgetrange_default (GstPad *pad); gboolean gst_proxy_pad_checkgetrange_default (GstPad *pad);

4
gst/gstminiobject.c
View file

@ -318,7 +318,7 @@ gst_mini_object_replace (GstMiniObject ** olddata, GstMiniObject * newdata)
/** /**
* gst_mini_object_weak_ref: (skip) * 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 * @notify: callback to invoke before the mini object is freed
* @data: extra data to pass to notify * @data: extra data to pass to notify
* *
@ -370,7 +370,7 @@ found:
/** /**
* gst_mini_object_weak_unref: (skip) * 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 * @notify: callback to search for
* @data: data to search for * @data: data to search for
* *

16
tests/examples/manual/Makefile.am
View file

@ -18,8 +18,6 @@ TESTS_ENVIRONMENT = \
GST_PLUGIN_SYSTEM_PATH= \ GST_PLUGIN_SYSTEM_PATH= \
GST_PLUGIN_PATH=$(top_builddir)/plugins GST_PLUGIN_PATH=$(top_builddir)/plugins
CLEANFILES = core core.* test-registry.* *.gcno *.gcda
EXTRA_DIST = extract.pl EXTRA_DIST = extract.pl
EXAMPLES = \ EXAMPLES = \
@ -42,6 +40,20 @@ EXAMPLES = \
decodebin \ decodebin \
$(GST_LOADSAVE_SRC) $(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) AM_CFLAGS = $(GST_OBJ_CFLAGS)
LDADD = $(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \ LDADD = $(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \
$(GST_OBJ_LIBS) $(GST_OBJ_LIBS)