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)
commit02250601cf750475013a59f1aa5e46f475b99b1b
tree526f4434b2dde42935f582eb8f45a6ddb97c3baf
parent487175f5735c9cc2f162949f24ab9b93b2b3570c
parent77fa4072ee70f26e3182517b952392d71233c5db
Merge remote-tracking branch 'origin/master' into 0.11
configure.ac
ext/ffmpeg/gstffmpeg.c
ext/libswscale/gstffmpegscale.c