Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 26 Sep 2011 17:22:05 +0000 (19:22 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 26 Sep 2011 17:22:05 +0000 (19:22 +0200)
commitf71511edd2d054ba8c76a086cfa9af14b07acd52
tree2262e6b3eae55d7a9c480dae14f547670d6dce78
parent754b22d7ee9a69631470daecb84792fa9af043eb
parent49ebe7c053755973ea1aa13b428a1b8b0aae38a2
Merge branch 'master' into 0.11

Conflicts:
gst-libs/gst/audio/gstaudiodecoder.c
gst-libs/gst/audio/gstaudioencoder.c
gst/encoding/gstencodebin.c
docs/libs/gst-plugins-base-libs-sections.txt
gst-libs/gst/audio/gstaudiodecoder.c
gst-libs/gst/audio/gstaudiodecoder.h
gst-libs/gst/audio/gstaudioencoder.c
gst-libs/gst/audio/gstaudioencoder.h
win32/common/libgstaudio.def