Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 28 Sep 2011 14:18:54 +0000 (16:18 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 28 Sep 2011 14:18:54 +0000 (16:18 +0200)
commit2e069225b974a73a0079fe621d6981499e6408c0
tree7dd629a55146b58cf33e1024baae77c90d7f986c
parent87fbd1e7840d604b133a4daf9c7b0651db66889a
parent671b56f9da6ce3e337307eeba5d25b2e29645560
Merge branch 'master' into 0.11
gst/matroska/matroska-demux.c