Add ffmpeg to Travis build
Fix merge conflict
Update to new taggolib API