Merge branch 'avconv'

Conflicts:
	.gitignore