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

* 'master' of https://github.com/yt-dlp/yt-dlp:
  [extractor/paramountplus] Update API token (#5285)
  [extractor/voot] Improve `_VALID_URL` (#5283)

yt_dlp/extractor/paramountplus.py

@@ -40,7 +40,6 @@ class ParamountPlusIE(CBSBaseIE):
         'params': {
             'skip_download': 'm3u8',
         },
-        'expected_warnings': ['Ignoring subtitle tracks'],  # TODO: Investigate this
     }, {
         'url': 'https://www.paramountplus.com/shows/video/6hSWYWRrR9EUTz7IEe5fJKBhYvSUfexd/',
         'info_dict': {
@@ -63,7 +62,6 @@ class ParamountPlusIE(CBSBaseIE):
         'params': {
             'skip_download': 'm3u8',
         },
-        'expected_warnings': ['Ignoring subtitle tracks'],
     }, {
         'url': 'https://www.paramountplus.com/movies/video/vM2vm0kE6vsS2U41VhMRKTOVHyQAr6pC/',
         'info_dict': {
@@ -118,8 +116,11 @@ class ParamountPlusIE(CBSBaseIE):
 
     def _extract_video_info(self, content_id, mpx_acc=2198311517):
         items_data = self._download_json(
-            'https://www.paramountplus.com/apps-api/v2.0/androidtv/video/cid/%s.json' % content_id,
-            content_id, query={'locale': 'en-us', 'at': 'ABCqWNNSwhIqINWIIAG+DFzcFUvF8/vcN6cNyXFFfNzWAIvXuoVgX+fK4naOC7V8MLI='}, headers=self.geo_verification_headers())
+            f'https://www.paramountplus.com/apps-api/v2.0/androidtv/video/cid/{content_id}.json',
+            content_id, query={
+                'locale': 'en-us',
+                'at': 'ABCXgPuoStiPipsK0OHVXIVh68zNys+G4f7nW9R6qH68GDOcneW6Kg89cJXGfiQCsj0=',
+            }, headers=self.geo_verification_headers())
 
         asset_types = {
             item.get('assetType'): {

yt_dlp/extractor/voot.py

@@ -14,7 +14,7 @@ class VootIE(InfoExtractor):
                         voot:|
                         https?://(?:www\.)?voot\.com/?
                         (?:
-                            movies/[^/]+/|
+                            movies?/[^/]+/|
                             (?:shows|kids)/(?:[^/]+/){4}
                         )
                      )
@@ -47,6 +47,9 @@ class VootIE(InfoExtractor):
     }, {
         'url': 'https://www.voot.com/movies/pandavas-5/424627',
         'only_matching': True,
+    }, {
+        'url': 'https://www.voot.com/movie/fight-club/621842',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):