Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 28 Sep 2011 10:44:59 +0000 (12:44 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 28 Sep 2011 10:44:59 +0000 (12:44 +0200)
commit87fbd1e7840d604b133a4daf9c7b0651db66889a
tree0d99ea4efb2b93f725f9e90bba42cde2bbeb4851
parent3f0b062d2f09fe83095b9f43bf31e953f2edd6f2
parent827c3aa14b3efd48c68e6ab565b29e6cfc0c0ca9
Merge branch 'master' into 0.11

Conflicts:
common
ext/pulse/pulsesink.c
ext/soup/gstsouphttpclientsink.c
gst/audioparsers/gstaacparse.c
gst/audioparsers/gstac3parse.c
gst/rtp/gstrtph264depay.c
gst/rtpmanager/gstrtpjitterbuffer.c
gst/rtpmanager/rtpjitterbuffer.c
gst/rtsp/gstrtspsrc.c
sys/ximage/gstximagesrc.c
27 files changed:
docs/plugins/Makefile.am
ext/pulse/pulsesink.c
ext/pulse/pulsesink.h
ext/soup/gstsouphttpclientsink.c
ext/soup/gstsouphttpsrc.c
ext/speex/gstspeexenc.c
gst/audioparsers/gstaacparse.c
gst/audioparsers/gstac3parse.c
gst/audioparsers/gstdcaparse.c
gst/audioparsers/gstflacparse.c
gst/audioparsers/gstmpegaudioparse.c
gst/debugutils/gstnavseek.c
gst/flv/gstflvmux.c
gst/isomp4/gstqtmux.c
gst/isomp4/qtdemux.c
gst/matroska/matroska-demux.c
gst/rtp/gstrtph264depay.c
gst/rtpmanager/gstrtpbin.c
gst/rtpmanager/gstrtpjitterbuffer.c
gst/rtpmanager/gstrtpsession.c
gst/rtpmanager/rtpjitterbuffer.c
gst/rtpmanager/rtpsession.c
gst/rtpmanager/rtpsource.c
gst/rtsp/gstrtspsrc.c
sys/v4l2/gstv4l2object.c
sys/ximage/gstximagesrc.c
sys/ximage/gstximagesrc.h