fix
Merge branch 'master' of https://github.com/danielhalupka/simpleffmpeg

Conflicts:
	plugin.xml