Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 6 Oct 2011 15:27:47 +0000 (17:27 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 6 Oct 2011 15:27:47 +0000 (17:27 +0200)
commitc6f005fef14ea027e64968084e06735647fb7f62
tree795d1a5826795f2947976f54db16be935b4a00b3
parent93289c2a029e9ae4465230345b251469f7b9d57b
parent49bd7b40caad7a449d54130336e19041dae687d7
Merge branch 'master' into 0.11
libs/gst/base/gstbaseparse.c