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)
1  2 
configure.ac
ext/ffmpeg/gstffmpegdec.c
ext/ffmpeg/gstffmpegdemux.c

diff --cc configure.ac
Simple merge
Simple merge
Simple merge