Merge commit '033aa428c1ade44dba61f63f9cf434b4645ddeb0' into tMod

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