Merge remote-tracking branch 'origin/0.10'
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 19 Apr 2012 12:49:18 +0000 (14:49 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 19 Apr 2012 12:49:18 +0000 (14:49 +0200)
commit8fee1561757f5f940805378e9bb3744d079b0f03
tree2dd12e8bacb11b2ddad07cdf8040aa41128a674b
parent5c9d454517dcab7e4c168ee804afb4768ac82f42
parentb053a50508d30e8bad5a6bed39ee7f264527f404
Merge remote-tracking branch 'origin/0.10'

Conflicts:
ext/libswscale/gstffmpegscale.c
ext/libswscale/gstffmpegscale.c