Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 7 Nov 2011 16:18:06 +0000 (17:18 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 7 Nov 2011 16:18:06 +0000 (17:18 +0100)
commit8c8fcf4d3bed149571ab48d999342da768b784b2
tree7f14ea10b3030949bd4c612e1deb08bc169e008a
parent616e9b706ed230bbed5008cfad06773d4cbe64e8
parent5d3852d91a08405ec4666243e2ad24844e6de857
Merge branch 'master' into 0.11
ext/ogg/gstoggdemux.c
ext/theora/gsttheoraenc.c