Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 7 Apr 2011 10:11:37 +0000 (12:11 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 7 Apr 2011 10:11:37 +0000 (12:11 +0200)
commit8faa99147677d626392879d397bec939e9c9445c
tree2fdf41a3013f1f74dec9891b4b4a4d6812301cca
parent450a4fdb5187401ed4a6f037487b90cc98207174
parentf63d36ade8fffc4a480d4637cf6649cee3dbac77
Merge branch 'master' into 0.11

Conflicts:
ext/ffmpeg/gstffmpegdec.c
ext/ffmpeg/gstffmpegdec.c