Merge remote-tracking branch 'origin/0.10'
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Fri, 15 Jun 2012 10:28:54 +0000 (12:28 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Fri, 15 Jun 2012 13:18:41 +0000 (15:18 +0200)
commit85f0dcb1e8a6ff12b2432da7ebb6ad11b283c7e8
tree7de5a01bf18c86036f8a0c1eed0bbb8ab75c1b80
parent107c00a761c1d361b88640e8256fe257afcb77e1
parent1db8779252afa264996e59c18430f70cc5582b28
Merge remote-tracking branch 'origin/0.10'
ext/ffmpeg/gstffmpegvidenc.c