diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2015-01-10 01:59:14 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2015-01-10 01:59:14 +0100 |
| commit | 45598f15788568a8432da19544e5bdc390032aca (patch) | |
| tree | e0c41e910eb267c6ef254f8d47cc36f32d5663ac /youtube_dl/YoutubeDL.py | |
| parent | 130239460370870c33f259ed1549878388996d3f (diff) | |
| parent | d02115f83727ae0d4f394073235dc97086c64266 (diff) | |
Merge remote-tracking branch 'aft90/merge-output-format'
Conflicts:
youtube_dl/YoutubeDL.py
Diffstat (limited to 'youtube_dl/YoutubeDL.py')
| -rwxr-xr-x | youtube_dl/YoutubeDL.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index e34b36016..61675d8ec 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -203,6 +203,7 @@ class YoutubeDL(object): Progress hooks are guaranteed to be called at least once (with status "finished") if the download is successful. + merge_output_format: Extension to use when merging formats. The following parameters are not used by YoutubeDL itself, they are used by @@ -909,6 +910,10 @@ class YoutubeDL(object): 'contain the video, try using ' '"-f %s+%s"' % (format_2, format_1)) return + output_ext = ( + formats_info[0]['ext'] + if self.params.get('merge_output_format') is None + else self.params['merge_output_format']) selected_format = { 'requested_formats': formats_info, 'format': rf, @@ -921,6 +926,7 @@ class YoutubeDL(object): 'vbr': formats_info[0].get('vbr'), 'acodec': formats_info[1].get('acodec'), 'abr': formats_info[1].get('abr'), + 'ext': output_ext, } else: selected_format = None |