Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 16 Feb 2012 13:23:28 +0000 (14:23 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 16 Feb 2012 13:23:28 +0000 (14:23 +0100)
commite44dd9db8f767f6dd2b157b285774d5938c3fc75
treedb6b069e3c71b73db249bc0d2aafe2c20ed6c4db
parentc7d0fb556f88f85bfabebe454d264457ed95afb3
parent439884d628fa80e710698e9bb36f063c503b9e79
Merge branch 'master' into 0.11

Conflicts:
gst-libs/gst/audio/gstaudioencoder.c
gst-libs/gst/pbutils/gstdiscoverer.c
gst-libs/gst/audio/gstaudiodecoder.c
gst-libs/gst/audio/gstaudiodecoder.h
gst-libs/gst/audio/gstaudioencoder.c
gst-libs/gst/audio/gstaudioencoder.h
gst-libs/gst/pbutils/gstdiscoverer.c
gst/playback/gstplaybin2.c