Merge branch 'master' into 0.11-fdo
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 15 Mar 2011 10:11:56 +0000 (11:11 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 15 Mar 2011 10:11:56 +0000 (11:11 +0100)
commit95f7fd8edf724a1b22c837ba4fa62f42d9affa4e
tree2ffa2f107708342f9438002ba5b3b981992ff20b
parent4a64969b3d6ee57fad6bbadcbc94a962e2d08046
parenta38fd9f9ec1fa6d16ce46674d6575662b4a2e801
Merge branch 'master' into 0.11-fdo
configure.ac
gst-libs/gst/pbutils/gstdiscoverer.c
gst/encoding/gstencodebin.c
gst/playback/gstdecodebin2.c
gst/playback/gstplaybin2.c