Merge branch 'plain' into 7mod

Conflicts:
	encoder/encoder.c
	encoder/set.c
	input/raw.c
	input/y4m.c