Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 10 Feb 2012 16:00:33 +0000 (17:00 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 10 Feb 2012 16:00:33 +0000 (17:00 +0100)
commit49f4bc87d9e5fb073d872e2a8fb25100bb579ed9
treecc013dcea49ddeb6fd303853129d6ffc01b3b323
parentbe075f643e7ce4f3267e4a29d7021be56c69ec66
parented561dcdb1b67212c748f2cd47f271639fd57bb3
Merge branch 'master' into 0.11

Conflicts:
ext/x264/gstx264enc.c
ext/mad/gstmad.c
ext/x264/gstx264enc.c
ext/x264/gstx264enc.h