multimedia/ffmpeg: replace r495918 with upstream fix
Patch conflict makes it easier to prune on update.