Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 18 Jan 2012 09:21:36 +0000 (10:21 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 18 Jan 2012 09:21:36 +0000 (10:21 +0100)
commit3393095cd0d95ba0243bb243e504d4cd1b47b23b
treefb8904d647e1548d9006d23244642145d4889548
parent0edb9f22f0a1ee0479f3ed548e9983c7acdb1ce8
parent99d47920144f08f7efd0ca03ec5ab583046c496d
Merge branch 'master' into 0.11
configure.ac
ext/ffmpeg/gstffmpegdec.c
ext/ffmpeg/gstffmpegdemux.c