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)
1  2 
gst/mpegtsmux/mpegtsmux.c
sys/directdraw/gstdirectdrawsink.c

Simple merge
Simple merge