Add mediainfo.
Merge conflict