X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fnytimes.py;h=fc78ca56c90d37b00c1f396aee7c896d54fb91c9;hb=f377edec067a05365824434d0c44c0f22d797190;hp=32e904ebfea073c6746f7561ec22b8a0cf1ce162;hpb=47da782337d52451e7ac08c394757a6bfecb2403;p=youtube-dl

diff --git a/youtube_dl/extractor/nytimes.py b/youtube_dl/extractor/nytimes.py
index 32e904ebf..fc78ca56c 100644
--- a/youtube_dl/extractor/nytimes.py
+++ b/youtube_dl/extractor/nytimes.py
@@ -69,10 +69,10 @@ class NYTimesBaseIE(InfoExtractor):
                     'width': int_or_none(video.get('width')),
                     'height': int_or_none(video.get('height')),
                     'filesize': get_file_size(video.get('file_size') or video.get('fileSize')),
-                    'tbr': int_or_none(video.get('bitrate'), 1000),
+                    'tbr': int_or_none(video.get('bitrate'), 1000) or None,
                     'ext': ext,
                 })
-        self._sort_formats(formats)
+        self._sort_formats(formats, ('height', 'width', 'filesize', 'tbr', 'fps', 'format_id'))
 
         thumbnails = []
         for image in video_data.get('images', []):
@@ -191,7 +191,7 @@ class NYTimesArticleIE(NYTimesBaseIE):
 
         episode = audio_data.get('podcast', {}).get('episode') or ''
         episode_number = int_or_none(self._search_regex(
-            r'[Ee]pisode\s+(\d+)', episode, 'epidode number', default=None))
+            r'[Ee]pisode\s+(\d+)', episode, 'episode number', default=None))
 
         return {
             'id': remove_start(podcast_audio.get('target'), 'FT') or page_id,