Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 14 Feb 2012 10:19:04 +0000 (11:19 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 14 Feb 2012 10:19:04 +0000 (11:19 +0100)
commiteff70374470cdc4459756d15bea61a83bac57ceb
tree85f7cb07c8c78827ff21ed16c083d0a7eba97807
parentb10b9cf109615afb2666e99547354c98d94a3cb2
parentac681a6efd8ee4f4046fb93764a351a87566cde2
Merge branch 'master' into 0.11
gst/mpegtsmux/mpegtsmux.c
sys/directdraw/gstdirectdrawsink.c