Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 2 Dec 2011 00:07:39 +0000 (00:07 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 2 Dec 2011 00:07:39 +0000 (00:07 +0000)
commitec0d3566bf15b6daa18f0df01b044b7cecfd9e45
tree99d9f2d2763f9409e7ca488c3d22ec1454c5720f
parenta7c44ea877efb35f6f43eb81f5aad8baa4b28a52
parent0cce8ab97d614ef53970292bd403e7f4460d79f9
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
ext/alsa/gstalsasrc.c
ext/alsa/gstalsasrc.h
gst/adder/gstadder.c
gst/playback/gstplaybin2.c
gst/playback/gstplaysinkconvertbin.c
win32/common/libgstvideo.def
docs/libs/gst-plugins-base-libs-sections.txt
ext/alsa/gstalsasrc.c
ext/ogg/gstoggdemux.c
gst-libs/gst/video/video.c
gst-libs/gst/video/video.h
gst/playback/gstplaybin2.c
gst/playback/gstplaysinkconvertbin.c
tests/check/elements/audioresample.c
win32/common/libgstvideo.def