video done
Merge branch 'master' of github.com:wenderen/depixelizing

Conflicts:
	resize-frames