Conflicts: src/audiofilters/msconf.c src/base/mscommon.c src/videofilters/videoenc.c src/voip/msvoip.c