Merge pull request #3123 from dangowrt/ffmpeg-enable-asm