gstreamer/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
..
adder Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
app android: make it ready for androgenizer 2011-04-11 07:23:21 +02:00
audioconvert Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
audiorate Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
audioresample Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
audiotestsrc Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
encoding Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
ffmpegcolorspace Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
gdp Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
playback Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
subparse plugins: port some plugins to the new memory API 2011-03-27 16:35:28 +02:00
tcp Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
typefind Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
videorate Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
videoscale Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
videotestsrc Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
volume Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
Makefile.am build: build plugin and example directories in parallel if make -jN is used 2010-03-29 00:26:59 +01:00