vc project
Merge branch 'master' of git://github.com/silicontrip/libav2yuv

Conflicts:
	.gitignore