mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source
This commit is contained in:
Sebastian Dröge 2011-04-16 16:06:02 +02:00
commit caaf5ad528
7 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst/Makefile.am
View file

@ -271,7 +271,8 @@ gir_headers=$(patsubst %,$(srcdir)/%, $(libgstreamer_@GST_MAJORMINOR@include_HEA
gir_sources=$(patsubst %,$(srcdir)/%, $(libgstreamer_@GST_MAJORMINOR@_la_SOURCES)) gir_sources=$(patsubst %,$(srcdir)/%, $(libgstreamer_@GST_MAJORMINOR@_la_SOURCES))
Gst-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstreamer-@GST_MAJORMINOR@.la Gst-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstreamer-@GST_MAJORMINOR@.la
$(AM_V_GEN)$(INTROSPECTION_SCANNER) -v --namespace Gst \ $(AM_V_GEN)GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
$(INTROSPECTION_SCANNER) -v --namespace Gst \
--nsversion=@GST_MAJORMINOR@ \ --nsversion=@GST_MAJORMINOR@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir) \ -I$(top_builddir) \
@ -286,7 +287,8 @@ Gst-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstreamer-@GST_MAJORMINOR@
--pkg gobject-2.0 \ --pkg gobject-2.0 \
--pkg gmodule-no-export-2.0 \ --pkg gmodule-no-export-2.0 \
--pkg gthread-2.0 \ --pkg gthread-2.0 \
--pkg-export gstreamer-0.11 \ --pkg-export gstreamer-@GST_MAJORMINOR@ \
--add-init-section="gst_init(NULL, NULL);" \
--output $@ \ --output $@ \
$(gir_headers) \ $(gir_headers) \
$(gir_sources) $(gir_sources)

6
libs/gst/base/Makefile.am
View file

@ -70,6 +70,7 @@ gir_cincludes=$(patsubst %,--c-include='gst/base/%',$(libgstbase_@GST_MAJORMINOR
GstBase-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstbase-@GST_MAJORMINOR@.la GstBase-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstbase-@GST_MAJORMINOR@.la
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
$(INTROSPECTION_SCANNER) -v --namespace GstBase \ $(INTROSPECTION_SCANNER) -v --namespace GstBase \
--nsversion=@GST_MAJORMINOR@ \ --nsversion=@GST_MAJORMINOR@ \
--strip-prefix=Gst \ --strip-prefix=Gst \
@ -84,8 +85,9 @@ GstBase-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstbase-@GST_MAJORMINO
--library=libgstbase-0.11.la \ --library=libgstbase-0.11.la \
--include=Gst-0.11 \ --include=Gst-0.11 \
--libtool="$(top_builddir)/libtool" \ --libtool="$(top_builddir)/libtool" \
--pkg gstreamer-0.11 \ --pkg gstreamer-@GST_MAJORMINOR@ \
--pkg-export gstreamer-base-0.11 \ --pkg-export gstreamer-base-@GST_MAJORMINOR@ \
--add-init-section="gst_init(NULL,NULL);" \
--output $@ \ --output $@ \
$(gir_headers) \ $(gir_headers) \
$(gir_sources) $(gir_sources)

6
libs/gst/check/Makefile.am
View file

@ -117,6 +117,7 @@ gir_cincludes=$(patsubst %,--c-include='gst/check/%',$(libgstcheck_@GST_MAJORMIN
GstCheck-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcheck-@GST_MAJORMINOR@.la GstCheck-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcheck-@GST_MAJORMINOR@.la
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
$(INTROSPECTION_SCANNER) -v --namespace GstCheck \ $(INTROSPECTION_SCANNER) -v --namespace GstCheck \
--nsversion=@GST_MAJORMINOR@ \ --nsversion=@GST_MAJORMINOR@ \
--strip-prefix=Gst \ --strip-prefix=Gst \
@ -131,8 +132,9 @@ GstCheck-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcheck-@GST_MAJORMI
--library=libgstcheck-0.11.la \ --library=libgstcheck-0.11.la \
--include=Gst-0.11 \ --include=Gst-0.11 \
--libtool="$(top_builddir)/libtool" \ --libtool="$(top_builddir)/libtool" \
--pkg gstreamer-0.11 \ --pkg gstreamer-@GST_MAJORMINOR@ \
--pkg-export gstreamer-check-0.11 \ --pkg-export gstreamer-check-@GST_MAJORMINOR@ \
--add-init-section="gst_init(NULL,NULL);" \
--output $@ \ --output $@ \
$(gir_headers) \ $(gir_headers) \
$(gir_sources) $(gir_sources)

2
libs/gst/controller/Makefile.am
View file

@ -53,6 +53,7 @@ gir_cincludes=$(patsubst %,--c-include='gst/controller/%',$(libgstcontroller_@GS
GstController-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcontroller-@GST_MAJORMINOR@.la GstController-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcontroller-@GST_MAJORMINOR@.la
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
$(INTROSPECTION_SCANNER) -v --namespace GstController \ $(INTROSPECTION_SCANNER) -v --namespace GstController \
--nsversion=@GST_MAJORMINOR@ \ --nsversion=@GST_MAJORMINOR@ \
--strip-prefix=Gst \ --strip-prefix=Gst \
@ -69,6 +70,7 @@ GstController-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcontroller-@G
--libtool="$(top_builddir)/libtool" \ --libtool="$(top_builddir)/libtool" \
--pkg gstreamer-@GST_MAJORMINOR@ \ --pkg gstreamer-@GST_MAJORMINOR@ \
--pkg-export gstreamer-controller-@GST_MAJORMINOR@ \ --pkg-export gstreamer-controller-@GST_MAJORMINOR@ \
--add-init-section="gst_init(NULL,NULL);" \
--output $@ \ --output $@ \
$(gir_headers) \ $(gir_headers) \
$(gir_sources) $(gir_sources)

2
libs/gst/dataprotocol/Makefile.am
View file

@ -43,6 +43,7 @@ gir_cincludes=$(patsubst %,--c-include='gst/dataprotocol/%',$(libgstdataprotocol
GstDataprotocol-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstdataprotocol-@GST_MAJORMINOR@.la GstDataprotocol-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstdataprotocol-@GST_MAJORMINOR@.la
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
$(INTROSPECTION_SCANNER) -v --namespace GstDataprotocol \ $(INTROSPECTION_SCANNER) -v --namespace GstDataprotocol \
--strip-prefix=Gst \ --strip-prefix=Gst \
--nsversion=@GST_MAJORMINOR@ \ --nsversion=@GST_MAJORMINOR@ \
@ -57,6 +58,7 @@ GstDataprotocol-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstdataprotoco
--libtool="$(top_builddir)/libtool" \ --libtool="$(top_builddir)/libtool" \
--pkg gstreamer-@GST_MAJORMINOR@ \ --pkg gstreamer-@GST_MAJORMINOR@ \
--pkg-export=gstreamer-dataprotocol-@GST_MAJORMINOR@ \ --pkg-export=gstreamer-dataprotocol-@GST_MAJORMINOR@ \
--add-init-section="gst_init(NULL,NULL);" \
--output $@ \ --output $@ \
$(gir_headers) \ $(gir_headers) \
$(gir_sources) $(gir_sources)

2
libs/gst/net/Makefile.am
View file

@ -45,6 +45,7 @@ gir_cincludes=--c-include="gst/net/gstnet.h"
GstNet-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstnet-@GST_MAJORMINOR@.la GstNet-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstnet-@GST_MAJORMINOR@.la
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
$(INTROSPECTION_SCANNER) -v --namespace GstNet \ $(INTROSPECTION_SCANNER) -v --namespace GstNet \
--strip-prefix=Gst \ --strip-prefix=Gst \
--nsversion=@GST_MAJORMINOR@ \ --nsversion=@GST_MAJORMINOR@ \
@ -61,6 +62,7 @@ GstNet-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstnet-@GST_MAJORMINOR@
--libtool="$(top_builddir)/libtool" \ --libtool="$(top_builddir)/libtool" \
--pkg gstreamer-@GST_MAJORMINOR@ \ --pkg gstreamer-@GST_MAJORMINOR@ \
--pkg-export="gstreamer-net-@GST_MAJORMINOR@" \ --pkg-export="gstreamer-net-@GST_MAJORMINOR@" \
--add-init-section="gst_init(NULL,NULL);" \
--output $@ \ --output $@ \
$(gir_headers) \ $(gir_headers) \
$(gir_sources) $(gir_sources)

3
win32/common/libgstbase.def
View file

@ -17,7 +17,10 @@ EXPORTS
gst_adapter_unmap gst_adapter_unmap
gst_base_parse_add_index_entry gst_base_parse_add_index_entry
gst_base_parse_convert_default gst_base_parse_convert_default
gst_base_parse_frame_free
gst_base_parse_frame_get_type
gst_base_parse_frame_init gst_base_parse_frame_init
gst_base_parse_frame_new
gst_base_parse_get_type gst_base_parse_get_type
gst_base_parse_push_frame gst_base_parse_push_frame
gst_base_parse_set_average_bitrate gst_base_parse_set_average_bitrate