Merge remote-tracking branch 'marcwebbie/master' into libav
fix duplicated assignment statement
try to get travis to run tests against ffmpeg and libav
Merge branch 'refs/heads/libav'