linux build fixes
Merge branch 'master' of github.com:grrrwaaa/av