Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 18 Aug 2011 17:37:39 +0000 (19:37 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 18 Aug 2011 17:37:39 +0000 (19:37 +0200)
commit135b41cb5b00d1385ad18965876e0c7866f70181
tree42c07cec635cfdec6fb7806cebbc8ef13a070e67
parent09b15d7dfebf5bce173e2083d9dd2b305ab97070
parente032d2667496f6be815d5c8ac0af08510829f947
Merge branch 'master' into 0.11
gst/matroska/matroska-demux.c