updated ffmpeg and MediaInfo
Merge pull request #52 from msavazzi/master

updated ffmpeg and MediaInfo
Merge remote-tracking branch 'upstream/master'