Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 27 Oct 2011 13:44:58 +0000 (15:44 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 27 Oct 2011 13:44:58 +0000 (15:44 +0200)
commit016d036137417662b97a59dee6402c62252e17af
treee20c51425da6e67f74769f6dd85964b8f0c09271
parentb21bb37657f773bf255c923620c55626d5abab4e
parent1a7acdc99e9355cdae4c50356346ffb0c06e7fc8
Merge branch 'master' into 0.11

Conflicts:
configure.ac
gst-libs/gst/audio/gstbaseaudiosink.c
gst/audioconvert/channelmixtest.c
gst/playback/gstplaybasebin.c
gst/playback/gstsubtitleoverlay.c
tests/examples/Makefile.am
tests/examples/audio/Makefile.am
13 files changed:
Android.mk
Makefile.am
ext/ogg/gstoggdemux.c
ext/vorbis/gstvorbisdec.c
gst-libs/gst/audio/gstaudiodecoder.c
gst-libs/gst/audio/gstbaseaudiosink.c
gst/playback/gstdecodebin2.c
gst/playback/gstplaysinkaudioconvert.c
gst/playback/gstsubtitleoverlay.c
sys/ximage/ximagesink.c
sys/xvimage/xvimagesink.c
tests/examples/Makefile.am
tests/examples/audio/Makefile.am