Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Sat, 26 Nov 2011 15:37:25 +0000 (15:37 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Sat, 26 Nov 2011 15:37:25 +0000 (15:37 +0000)
commit77361e2919c5c09494908dc8d74599dce1aaacc5
tree374f69a7aec329c6cd2baac26dfa86a0140c7b6d
parent181be8d52b7d84a9e997800efd0b97225250b192
parent43190ea0f8537c437aaf291f7ade2cfc4241a440
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
ext/opus/gstopusdec.c
ext/opus/gstopusparse.c
gst-libs/gst/video/gstbasevideodecoder.c
gst-libs/gst/video/gstbasevideodecoder.h
ext/opus/gstopusdec.c
ext/opus/gstopusenc.c
ext/opus/gstopusheader.c
ext/opus/gstopusparse.c
ext/vp8/gstvp8dec.c
gst-libs/gst/video/gstbasevideodecoder.c
gst-libs/gst/video/gstbasevideodecoder.h
tests/check/Makefile.am