Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 3 Aug 2011 16:25:30 +0000 (18:25 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 3 Aug 2011 16:25:30 +0000 (18:25 +0200)
commit4121021bb2e40c09ee6e5e8e279b952a2dffc167
tree1be64bcff4656b79e1b33c6f344d3ac199e69244
parentcfbb591252b2ff8a6d396bfdb41b936881403220
parent1438bf26ac6f2cc5c1cd3c6d6cba7ddc9ccda390
Merge branch 'master' into 0.11

Conflicts:
ext/pulse/pulsesink.c
ext/pulse/pulsesrc.c
gst/audioparsers/gstac3parse.c
gst/rtp/gstrtph264depay.c
gst/rtp/gstrtph264pay.c
gst/rtpmanager/gstrtpssrcdemux.c
18 files changed:
configure.ac
ext/jack/gstjackaudiosink.c
ext/pulse/pulsesink.c
ext/pulse/pulsesrc.c
gst/audioparsers/gstac3parse.c
gst/auparse/gstauparse.c
gst/isomp4/qtdemux.c
gst/matroska/matroska-demux.c
gst/multifile/gstmultifilesink.c
gst/multipart/multipartdemux.c
gst/multipart/multipartmux.c
gst/rtp/gstrtph264depay.c
gst/rtp/gstrtph264pay.c
gst/rtp/gstrtpjpegpay.c
gst/rtpmanager/gstrtpssrcdemux.c
gst/rtpmanager/rtpsession.c
gst/rtsp/gstrtspsrc.c
sys/v4l2/gstv4l2object.c