Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 9 Nov 2011 16:40:10 +0000 (17:40 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 9 Nov 2011 16:40:10 +0000 (17:40 +0100)
commit221ea2fc444944fc1f8e0e37fdbbf6bcaf96c0bd
treec52d280919240f75c85c6e404dcb58d4d6226771
parentaa0b2b7ea7865674b9302e3fdedd8a28c880d4fb
parentf4506d51815e05125f1625071de6a5e6a9f8908f
Merge branch 'master' into 0.11
gst/avi/gstavidemux.c