Merge branch 'plain' into lsmash+mod-devel

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