更新编译
Merge branch 'master' of https://github.com/iwallee/3rd

Conflicts:
	sdk/bin/libfaacd.dll
	sdk/build/libfaac_dlld.pdb