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)
commit296786c01121a2f6258bfb2494d8b56ba4861afe
tree0bd199e6bad0ea66f14c073a277553141d09819c
parentf566dae7dc2b2af7906ca44193d86110ff28925b
parent2befc00dea12f103024bdd4ee8bc3fdc825f1e61
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
ext/opus/gstopusdec.c
ext/opus/gstopusenc.c