Merge pull request #353 from FiloSottile/avconv