Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Tue, 20 Mar 2012 12:08:23 +0000 (12:08 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Tue, 20 Mar 2012 12:08:23 +0000 (12:08 +0000)
commitef64b43ac8e0f9af4909bb50c76e6b62a43d5f5e
treeea9caca68af0308e7f9b5affa7ae38527512a174
parentaeaa143e4e56f4a385cbfa75f3bc36dc88f8d9d3
parent6d44ed77a4779e991084caccec51926986427e0d
Merge remote-tracking branch 'origin/master' into 0.11

So 0.11 folks also get amr include fixes.

Conflicts:
ext/a52dec/gsta52dec.c
ext/mad/gstmad.c
configure.ac
ext/a52dec/gsta52dec.c
ext/a52dec/gsta52dec.h
ext/dvdread/dvdreadsrc.c
ext/mad/gstmad.c
ext/mad/gstmad.c.orig
ext/mpeg2dec/gstmpeg2dec.c