gstreamer/gst-libs/gst
Wim Taymans 6e160bed3d Merge branch 'master' into 0.11
Conflicts:
	android/alsa.mk
	android/app.mk
	android/app_plugin.mk
	android/audio.mk
	android/audioconvert.mk
	android/decodebin.mk
	android/decodebin2.mk
	android/gdp.mk
	android/interfaces.mk
	android/netbuffer.mk
	android/pbutils.mk
	android/playbin.mk
	android/queue2.mk
	android/riff.mk
	android/rtp.mk
	android/rtsp.mk
	android/sdp.mk
	android/tag.mk
	android/tcp.mk
	android/typefindfunctions.mk
	android/video.mk
2011-04-11 11:37:51 +02:00
..
app Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
audio Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
cdda libs: make sure gobject-introspection scanner calls gst_init() 2011-03-30 21:08:29 +01:00
fft android: make it ready for androgenizer 2011-04-11 07:23:21 +02:00
floatcast gst/: Include glib.h instead of a specific GLib header. Including single 2008-12-10 08:19:13 +00:00
interfaces android: make it ready for androgenizer 2011-04-11 07:23:21 +02:00
netbuffer Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
pbutils Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
riff Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
rtp Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
rtsp android: make it ready for androgenizer 2011-04-11 07:23:21 +02:00
sdp android: make it ready for androgenizer 2011-04-11 07:23:21 +02:00
tag Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
video Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
gettext.h Fix for ENABLE_NLS being undefined for -Wundef 2010-03-16 18:06:16 +01:00
gst-i18n-plugin.h *.h: Revert indenting 2004-03-15 16:32:55 +00:00
Makefile.am gst-libs: build pbutils after video 2010-09-22 01:50:21 -07:00