Remove dupe "mp4" and group extensions somewhat.

7b8e175140345a9ba2e05bf81176dbd2fb482737 introduced `mp4` after it was added by efdeb1c4307a607ea7d911c314f811c3be00087f. This removes the duplicate and groups the other extensions somewhat.