Merge branch 'master' of https://github.com/DarkShikari/x264-devel into lsmash+mod

Conflicts:
	common/frame.c
	configure