X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2FYoutubeDL.py;h=e1be38a53fcf02b5de2badcf777bbb532eff698b;hb=56327689a25a4492b68c1b02519f259c924f3da6;hp=3786799da7967ca8522462758ee81318f1e06214;hpb=a015dce0e243b48ca2124f82bfe40b579412484d;p=youtube-dl diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 3786799da..e1be38a53 100644 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -55,7 +55,7 @@ from .utils import ( ) from .extractor import get_info_extractor, gen_extractors from .downloader import get_suitable_downloader -from .PostProcessor import FFmpegMergerPP +from .postprocessor import FFmpegMergerPP from .version import __version__ @@ -702,7 +702,7 @@ class YoutubeDL(object): if req_format in ('-1', 'all'): formats_to_download = formats else: - # We can accept formats requestd in the format: 34/5/best, we pick + # We can accept formats requested in the format: 34/5/best, we pick # the first that is available, starting from left req_formats = req_format.split('/') for rf in req_formats: @@ -712,7 +712,11 @@ class YoutubeDL(object): formats_info = (self.select_format(format_1, formats), self.select_format(format_2, formats)) if all(formats_info): - selected_format = {'requested_formats': formats_info} + selected_format = { + 'requested_formats': formats_info, + 'format': rf, + 'ext': formats_info[0]['ext'], + } else: selected_format = None else: