Merge branch 'plain' into lsmash+mod-devel

Conflicts:
	common/common.c
	configure
	output/mp4.c
	version.sh
	x264.c
	x264.h