Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 19 Aug 2011 12:07:11 +0000 (14:07 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 19 Aug 2011 12:07:11 +0000 (14:07 +0200)
commitb657f5bce78c924032badd04fd57b4d8c25bab7c
treec704d83ff05e0a28bf0443db4d02b999821ba75e
parent17dd31b0f41f76864797eda6df26a88721115ba2
parentb7bb1e56336b9d3167213e0f48fa0a25ea4b0ad4
Merge branch 'master' into 0.11
ext/ogg/gstoggdemux.c
ext/ogg/gstoggparse.c