ffmpegを追加
Merge branch 'mac_os_x' of https://github.com/takel-shiba/chef-rcms into mac_os_x

Conflicts:
	cookbooks/imagemagick/recipes/mac_os_x.rb