Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Thu, 8 Mar 2012 20:31:34 +0000 (20:31 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Thu, 8 Mar 2012 20:31:34 +0000 (20:31 +0000)
commit29c266ccffeac9136196a2bdac52e47cd5f69532
treedbb2c8f7e569f17bbeb3be9c391188957277bfe0
parent8ebd13ee5efad33199f010e2335ee6f8bf27aab4
parentb2a162ca771fd3969207028190b2c3166da5c171
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
common
docs/libs/gst-plugins-base-libs.types
ext/pango/gsttextoverlay.c
ext/vorbis/gstvorbisdec.c
gst/playback/gstplaysink.c
gst/playback/gstplaysinkconvertbin.c
sys/ximage/ximagesink.c
sys/xvimage/xvimagesink.c
14 files changed:
configure.ac
ext/pango/gsttextrender.c
ext/vorbis/gstvorbisdec.c
ext/vorbis/gstvorbisdec.h
gst-libs/gst/audio/gstaudiodecoder.c
gst-libs/gst/audio/gstaudiodecoder.h
gst-libs/gst/pbutils/gstdiscoverer.c
gst-libs/gst/pbutils/install-plugins.c
gst/playback/gstplaysink.c
gst/playback/gstplaysinkconvertbin.c
sys/ximage/ximagesink.c
sys/xvimage/xvimagesink.c
tests/check/elements/videoscale.c
win32/common/libgstaudio.def