Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 11 Apr 2011 09:37:51 +0000 (11:37 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 11 Apr 2011 09:37:51 +0000 (11:37 +0200)
commit6e160bed3debba38efdcf433efc5ecc74d840321
tree0f6e9663fa21b3e61b958a1a7f50b37eeece2b09
parent3ea2bc3ab0427558682fa91f2abac907d9d7b53b
parent030f639a8e4eb1ab2fcf03301d0a39168e7e3ab7
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
26 files changed:
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
ext/vorbis/gstvorbisdec.c
gst-libs/gst/app/Makefile.am
gst-libs/gst/rtp/gstbasertpdepayload.c
gst-libs/gst/rtp/gstbasertppayload.c
gst/audioresample/gstaudioresample.c