Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 18 Apr 2011 08:23:45 +0000 (10:23 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 18 Apr 2011 08:23:45 +0000 (10:23 +0200)
commit7555d0949f231f2263b45b0e791a1884fdc2c771
treef4a09aefcf97006a60303e8b93392de6b18788f7
parent8a4ae3dd2de4de1a11d982102e3881e313d4f37a
parent75d5c41f2903b6703aa4d70b5f9fce6db1ad1e03
Merge branch 'master' into 0.11

Conflicts:
android/apetag.mk
android/avi.mk
android/flv.mk
android/icydemux.mk
android/id3demux.mk
android/qtdemux.mk
android/rtp.mk
android/rtpmanager.mk
android/rtsp.mk
android/soup.mk
android/udp.mk
android/wavenc.mk
android/wavparse.mk
configure.ac
15 files changed:
configure.ac
ext/jpeg/gstjpegdec.c
ext/pulse/pulsesrc.c
gst/avi/gstavidemux.c
gst/flv/gstflvdemux.c
gst/imagefreeze/gstimagefreeze.c
gst/matroska/matroska-demux.c
gst/quicktime/qtdemux.c
gst/replaygain/Makefile.am
gst/rtp/gstrtpbvdepay.c
gst/rtpmanager/rtpsession.c
gst/videofilter/gstvideobalance.c
gst/videofilter/gstvideoflip.c
gst/videomixer/gstcollectpads2.c
sys/oss4/oss4-mixer-slider.c