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)
1  2 
ext/ogg/gstoggdemux.c
ext/theora/gsttheoraenc.c

Simple merge
Simple merge