Merge branch 'plain' into master+mod

Conflicts:
	configure
	input/raw.c
	x264.c