upgrade ffmpeg to 2.1
Merge branch 'master' of github.com:jovoto-team/ffmpeg-cookbook

Conflicts:
	attributes/default.rb