Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 28 Sep 2011 11:29:08 +0000 (13:29 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 28 Sep 2011 11:29:08 +0000 (13:29 +0200)
commitafb740b8975f64d54f6f92698eba7200601c4827
tree45e8c4f66babfef9abba5a374b5c8637dfe107cd
parent09a66b0923817fb3d8ea40a2012598313d9d1ab0
parent8bf3d5a2b77eff15e130bde36366457c26b7f66a
Merge branch 'master' into 0.11

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