Edward Hervey b78b980d72 Merge remote-tracking branch 'origin/master' into 0.11 ...

Conflicts:
	ext/faac/gstfaac.c
	ext/opus/gstopusdec.c
	ext/opus/gstopusenc.c
	gst/audiovisualizers/gstspacescope.c
	gst/colorspace/colorspace.c

2011-11-25 12:48:58 +01:00

..

gstfaac.c

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

2011-11-25 12:48:58 +01:00

gstfaac.h

faac: port to audioencoder

2011-09-22 16:02:49 +02:00

Makefile.am

faac: port to audioencoder

2011-09-22 16:02:49 +02:00