Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 8 Jun 2011 16:06:56 +0000 (18:06 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 8 Jun 2011 16:06:56 +0000 (18:06 +0200)
commit710fa239d53aa599d88e7847a45b2cb548aae6a2
treea9e686c3a95cac834b4556b78fd7d3220be5dfd8
parent0af32751aec8d6c3202df2be3ce4127c155edfc5
parent9175a903fb201cb74f996d7a2c28b1dc497cc720
Merge branch 'master' into 0.11
gst/matroska/matroska-demux.c
gst/rtsp/gstrtspsrc.c