Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 22 Jul 2011 15:54:32 +0000 (17:54 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 22 Jul 2011 15:54:32 +0000 (17:54 +0200)
commit05a5c7f5135e610cd8186eed39963b42fca346b2
tree368f02f4ec911a82e4b816be9b0d463116295c9b
parentb41422f1f309d084699a1c5dcfc4675aa9d10241
parent4e71f12ee909c61e79316f3f214e194f0f7d7056
Merge branch 'master' into 0.11

Conflicts:
configure.ac
ext/ffmpeg/gstffmpegcodecmap.c
configure.ac
ext/ffmpeg/gstffmpegcodecmap.c