Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Sun, 9 Oct 2011 15:29:05 +0000 (16:29 +0100)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Sun, 9 Oct 2011 15:29:05 +0000 (16:29 +0100)
commit8c762dabb2430223f56fa7c88427ab406b8582e9
tree67ad39262d414eb6be796418695c08a0b5f94479
parent309b5fa0c148d4f69c31ab45ab0c771a55fe9fd5
parentca417fd3768cd537cab979212c5e3d33fe63070f
Merge remote-tracking branch 'origin/master' into 0.11
gst/isomp4/atomsrecovery.c