Merge branch 'master' of https://github.com/yt-dlp/yt-dlp into ytdlp

* 'master' of https://github.com/yt-dlp/yt-dlp:
  Fix `-f mp4` behaving differently from youtube-dl
  [build] Allow building with py2exe (and misc fixes) py2exe config is copied from youtube-dl Closes #1160
  [EmbedSubtitle, SubtitlesConvertor] Fix error when subtitle file is missing Closes #1152, #1134 Bug from 8e25d624
  [funimation] Sort formats according to the relevant extractor-args