gstreamer/android
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
..
alsa.mk Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
app.mk Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
app_plugin.mk Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
audio.mk Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
audioconvert.mk Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
audioresample.mk android: make it ready for androgenizer 2011-04-11 07:23:21 +02:00
audiotestsrc.mk android: make it ready for androgenizer 2011-04-11 07:23:21 +02:00
decodebin.mk Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
decodebin2.mk Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
ffmpegcolorspace.mk android: make it ready for androgenizer 2011-04-11 07:23:21 +02:00
gdp.mk Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
interfaces.mk Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
netbuffer.mk Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
NOTICE Add build system for Android 2010-12-03 17:41:18 +01:00
pbutils.mk Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
playbin.mk Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
queue2.mk Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
riff.mk Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
rtp.mk Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
rtsp.mk Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
sdp.mk Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
tag.mk Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
tcp.mk Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
typefindfunctions.mk Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
video.mk Merge branch 'master' into 0.11 2011-04-11 11:37:51 +02:00
videoscale.mk android: make it ready for androgenizer 2011-04-11 07:23:21 +02:00
videotestsrc.mk android: make it ready for androgenizer 2011-04-11 07:23:21 +02:00