Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 23 Nov 2011 10:08:39 +0000 (11:08 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 23 Nov 2011 10:08:39 +0000 (11:08 +0100)
commit0a9387c43cffab2c357d79a64b02c1058b7cee89
tree8cb09e4a9b5bdae8ffb8d4df3394920e132c3aa4
parente813abf631ac9cddd94f0137d2d717cf551fe4c9
parente3d1a50c0d2a30558e3a46d9ba74d27f153cc670
Merge branch 'master' into 0.11

Conflicts:
ext/opus/gstopusdec.c
ext/opus/gstopusenc.c
ext/opus/gstopusparse.c
gst/audiovisualizers/gstwavescope.c
gst/filter/Makefile.am
gst/filter/gstfilter.c
gst/filter/gstiir.c
gst/playondemand/gstplayondemand.c
configure.ac
ext/opus/gstopusdec.c
ext/opus/gstopusenc.c
ext/opus/gstopusparse.c
gst-libs/gst/video/gstbasevideodecoder.c
gst-libs/gst/video/gstbasevideoencoder.c
gst/audiovisualizers/Makefile.am
gst/audiovisualizers/gstwavescope.c
tests/check/Makefile.am