Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Sun, 8 May 2011 11:14:55 +0000 (13:14 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Sun, 8 May 2011 11:14:55 +0000 (13:14 +0200)
commit24573211c6b0077c756c84edc62121d5b6822206
tree421192d9acf73dee084f34373df3476cbd4f3037
parentd34ca6140b601bc4391db75e64a7c0d16bd836a0
parentdccde2652fa50996877950f81ec70ea541010bdc
Merge branch 'master' into 0.11
libs/gst/base/gstbaseparse.c