Merge pull request #4154 from sraue/ffmpeg-static-fixes