Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 28 Oct 2011 09:34:37 +0000 (11:34 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 28 Oct 2011 09:34:37 +0000 (11:34 +0200)
commit4f9dea137ff9698962de8930d3399cd15f0cf996
treeda1e702cd4514a7f8bbfcaac2edf7d1590498994
parent9beff28579e76b9d526f3b091c72cb73557224f8
parent88491ff2e7822c5ad09b648dd4bae0844ac22946
Merge branch 'master' into 0.11
ext/ogg/gstoggmux.c
gst/typefind/gsttypefindfunctions.c