Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 7 Jul 2011 11:50:18 +0000 (13:50 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 7 Jul 2011 11:50:18 +0000 (13:50 +0200)
commitfc6b32330a36e00ec36226a6029905023ff5aa61
tree3174038d1e434c36e62501ccf282c9230fb31902
parent508d4918b01d4cbc43d5bfd7515ca1fc8d4adf19
parent37f5d70332296c53bf6d9c1d012f53c67a8f91f0
Merge branch 'master' into 0.11

Conflicts:
configure.ac
ext/ffmpeg/gstffmpegdec.c
ext/ffmpeg/gstffmpegcodecmap.c
ext/ffmpeg/gstffmpegdec.c
ext/ffmpeg/gstffmpegutils.c
ext/ffmpeg/gstffmpegutils.h