Add x264-git and ffmpeg-git
Update midori-granite