Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Mon, 16 May 2011 15:06:22 +0000 (17:06 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Mon, 16 May 2011 15:06:22 +0000 (17:06 +0200)
commitd0362c2b87a234fa03c7d41d7eec6602512e307a
treee9ded9802a86b83d2acfb2afd4b2f60a54fa364d
parent7f6697020e0a82af2fdc9682e494bfccd0a929eb
parenteba4a948fb28216390bd66fe0e890086007196b3
Merge branch 'master' into 0.11

Conflicts:
configure.ac
ext/alsa/gstalsasrc.c
gst-libs/gst/audio/gstbaseaudiosink.c
gst-libs/gst/tag/gstxmptag.c
gst/playback/gstsubtitleoverlay.c
gst/videorate/gstvideorate.c
sys/xvimage/xvimagesink.c
14 files changed:
configure.ac
ext/alsa/gstalsasrc.c
gst-libs/gst/audio/gstbaseaudiosink.c
gst-libs/gst/audio/gstringbuffer.c
gst-libs/gst/audio/gstringbuffer.h
gst-libs/gst/tag/gstxmptag.c
gst/encoding/gstencodebin.c
gst/playback/gstdecodebin2.c
gst/playback/gstplaybin2.c
gst/playback/gstplaysink.c
gst/playback/gstsubtitleoverlay.c
gst/playback/gsturidecodebin.c
gst/videorate/gstvideorate.c
tests/check/libs/tag.c