Merge remote-tracking branch 'origin/master' into 0.11
authorEdward Hervey <edward.hervey@collabora.co.uk>
Fri, 25 Nov 2011 11:48:58 +0000 (12:48 +0100)
committerEdward Hervey <edward.hervey@collabora.co.uk>
Fri, 25 Nov 2011 11:48:58 +0000 (12:48 +0100)
commitb78b980d7236d03378450ac89452dc4ec537824c
tree1a4bbff76ac8020b99f3321afa73eebbb4e9006d
parentc41b5d016cbbe8dc6fa99a377b169e96d24238a9
parentcdcc39455cc92ba5e6988056b03ac9c350a9bb6a
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
14 files changed:
configure.ac
ext/faac/gstfaac.c
ext/opus/gstopusdec.c
ext/opus/gstopusenc.c
ext/opus/gstopusheader.c
ext/opus/gstopusparse.c
gst/audiovisualizers/gstspacescope.c
gst/audiovisualizers/gstwavescope.c
gst/frei0r/gstfrei0r.c
gst/mpeg4videoparse/mpeg4videoparse.c
gst/videoparsers/gstdiracparse.c
gst/videoparsers/gsth263parse.c
gst/videoparsers/gstmpegvideoparse.c
sys/Makefile.am