[avidemux] More tweaks to the gcc 6 patch.