Merge branch 'plain' into lsmash+mod

Conflicts:
	common/frame.c
	configure