Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 31 Oct 2011 14:53:01 +0000 (14:53 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 31 Oct 2011 14:53:01 +0000 (14:53 +0000)
1  2 
configure.ac
ext/ffmpeg/gstffmpeg.c
ext/libswscale/gstffmpegscale.c

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