Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 10 Feb 2012 15:23:14 +0000 (16:23 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 10 Feb 2012 15:23:14 +0000 (16:23 +0100)
commit225e98d62349b94aed9e4e8158b62626ca3b1218
treebce712901ccd937f376affee6e35d28f15f333d4
parent8eca20ead0cf8ce170de394f342726d28c593677
parent5b25f3737b488c3ddd7f5c2d4f9bd68a46e44da7
Merge branch 'master' into 0.11

Conflicts:
ext/flac/gstflacenc.c
ext/jack/gstjackaudioclient.c
ext/jack/gstjackaudiosink.c
ext/jack/gstjackaudiosrc.c
ext/pulse/plugin.c
ext/shout2/gstshout2.c
gst/matroska/matroska-mux.c
gst/rtp/gstrtph264pay.c
17 files changed:
ext/flac/gstflacenc.c
ext/jack/gstjackaudioclient.c
ext/jack/gstjackaudiosink.c
ext/jack/gstjackaudiosrc.c
ext/shout2/gstshout2.c
gst/flv/gstflvdemux.c
gst/flv/gstflvmux.c
gst/matroska/matroska-demux.c
gst/matroska/matroska-mux.c
gst/rtp/gstrtph264depay.c
gst/rtp/gstrtph264pay.c
gst/rtp/gstrtpmp2tpay.c
gst/rtpmanager/gstrtpbin.c
gst/rtpmanager/rtpsession.c
gst/udp/gstmultiudpsink.c
gst/videobox/gstvideobox.c
tests/check/elements/rtp-payloading.c