Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 7 Apr 2011 10:38:01 +0000 (12:38 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 7 Apr 2011 10:38:01 +0000 (12:38 +0200)
commit4dc84f9aff57837296110eb06de440bd13ebba9b
tree32171cfc5a934ac5dae80b56652697f3988c7d96
parent112231dc899f594a31cedf0103ad833cfd8e5ba7
parent6444bd2557139b80b6b9ca4e0b4856fd996b3ba1
Merge branch 'master' into 0.11

Conflicts:
ext/ffmpeg/gstffmpegdec.c