Tim-Philipp Müller ef64b43ac8 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

2012-03-20 12:08:23 +00:00

..

gsta52dec.c

Merge remote-tracking branch 'origin/master' into 0.11

2012-03-20 12:08:23 +00:00

gsta52dec.h

Merge remote-tracking branch 'origin/master' into 0.11

2012-03-20 12:08:23 +00:00

Makefile.am

a52dec: port to audiodecoder

2011-12-14 17:37:50 +01:00