Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 17 Nov 2011 16:17:11 +0000 (17:17 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 17 Nov 2011 16:17:11 +0000 (17:17 +0100)
commit07cc855b242e8ff757786bd2320f4db74e99cdfa
tree69da7fbaaab21d5ec37f9113bae0e05f89ae8969
parent105650127e90982d96dd50971adcf90971a945d2
parent7df81223220600b7e27f1fdc1be25891dc63bdba
Merge branch 'master' into 0.11

Conflicts:
ext/speex/gstspeexenc.c
gst/rtpmanager/rtpsession.c
ext/flac/gstflacenc.c
ext/speex/gstspeexenc.c
gst/audioparsers/gstflacparse.c
gst/rtpmanager/gstrtpsession.c
gst/rtpmanager/rtpsession.c
gst/rtpmanager/rtpsession.h
gst/rtpmanager/rtpsource.h
sys/v4l2/gstv4l2object.c