Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 7 Nov 2011 11:23:15 +0000 (12:23 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 7 Nov 2011 11:23:15 +0000 (12:23 +0100)
commit7ac25e9b26dcf61cf26bdcf83b0e361c75c3ef4d
treef1c258673c9db7ec6b7e8711c32fe11d21971a54
parent6cc887c53bb6d7ce8efbeea4e7d1a754a3622070
parent3df415d4c7d142cf07f805464ab9f41d098b505f
Merge branch 'master' into 0.11

Conflicts:
common
configure.ac
gst-libs/gst/audio/gstbaseaudiosink.c
gst/playback/gstdecodebin2.c
gst/playback/gstplaysinkaudioconvert.c
gst/playback/gstplaysinkaudioconvert.h
gst/playback/gstplaysinkvideoconvert.c
gst/playback/gstplaysinkvideoconvert.h
common
configure.ac
ext/ogg/gstoggmux.c
gst-libs/gst/audio/gstbaseaudiosink.c
gst-libs/gst/audio/gstbaseaudiosink.h
gst-libs/gst/tag/Makefile.am
gst/playback/Makefile.am
gst/playback/gstdecodebin2.c
gst/playback/gstplaysink.c
gst/playback/gstsubtitleoverlay.c