Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 31 Oct 2011 14:34:57 +0000 (14:34 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 31 Oct 2011 14:34:57 +0000 (14:34 +0000)
commitd919b7b0f488b23492a05a21f0210e4e4ede5e16
tree74ddb9af0fad05ace5510e53feb2d1686707db1f
parentc5838071d5ccc96b8f98f9a87298fd3c5f1631c5
parentdaecb7445672c1b334d64a701a20528dc305fe9e
Merge remote-tracking branch 'origin/master' into 0.11
gst/asfdemux/gstasfdemux.c