Merge branch 'master' into avmaster
Merge branch 'master' of github.com:avTranscoder/avTranscoder into avmaster
Merge branch 'avmaster'
Merge branch 'master' of github.com:avTranscoder/avTranscoder into avmaster
Merge branch 'avmaster'
revert to fix transcoder
Merge pull request #17 from MarcAntoine-Arnaud/master

minor fixes