Merge pull request #16 from gkranis/master

Fix integer scale,custom aspect ratio
Update retroosd.c

fix pitch change
Merge remote-tracking branch 'upstream/master'

Conflicts:
	0151/src/osd/retro/retroosd.c