Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 11 Nov 2011 18:36:23 +0000 (19:36 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 11 Nov 2011 18:36:23 +0000 (19:36 +0100)
commit2886955d18bb4823c7428d9243057162aa34909c
tree8e76ae762ea318f1cf8401d3601d642246ca6b75
parentbdf3845498a2d523aa1d498ed3818cacd3db54f2
parent7b5e1666a46c3b2f90f48bc352586d166e360b00
Merge branch 'master' into 0.11
gst/playback/gstplaysinkconvertbin.c