Fix compile using msvc after std namespace changes.
Merge branch 'master' into devel/resync-ffmpeg