Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 17 Nov 2011 16:32:42 +0000 (17:32 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 17 Nov 2011 16:32:42 +0000 (17:32 +0100)
commitf566dae7dc2b2af7906ca44193d86110ff28925b
tree0efb34eefdb5c181ec58d27fc42a1813ed545cca
parentacf18e34bedb68dbe927a32183b29eeac2023e4c
parentccc04a1529e89da251383f8988f7c129265d20e3
Merge branch 'master' into 0.11

Conflicts:
ext/celt/gstceltdec.c
ext/opus/gstopusdec.c
ext/opus/gstopusdec.h
ext/opus/gstopusenc.c
ext/opus/gstopusenc.h
ext/opus/gstopusparse.c
ext/opus/gstopusdec.c
ext/opus/gstopusenc.c