Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 9 Nov 2011 11:11:59 +0000 (12:11 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 9 Nov 2011 11:11:59 +0000 (12:11 +0100)
commitd77c8cafeed2ca9d614b4e11facf9b359bec342b
tree036bf0b84409fb9baf2b58636d238fba79cc9cb0
parent372b9329b923bc5e9991cc1067cd5d5352edc962
parent73be2b4b1af0aeb1816bcaf53511fad40d260290
Merge branch 'master' into 0.11

Conflicts:
common
ext/pango/gsttextoverlay.c
gst-libs/gst/video/video.c
common
configure.ac
gst-libs/gst/audio/gstaudioiec61937.c
gst-libs/gst/audio/gstbaseaudiosink.c
gst-libs/gst/audio/gstbaseaudiosink.h
tests/examples/seek/seek.c
win32/common/libgstaudio.def