From 9937190b73e26b9a869736cee079360a33abd612 Mon Sep 17 00:00:00 2001 From: Jake Holland Date: Tue, 12 May 2015 16:00:59 -0700 Subject: [PATCH 1/4] patch for https://github.com/rg3/youtube-dl/issues/5683 --- youtube_dl/YoutubeDL.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 4cf83c510..8633a6ffe 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -914,6 +914,9 @@ class YoutubeDL(object): if not available_formats: return None + if not FFmpegMergerPP(self).available: + available_formats = filter(lambda x: x.get(u'protocol') != u'm3u8', available_formats) + if format_spec in ['best', 'worst', None]: format_idx = 0 if format_spec == 'worst' else -1 audiovideo_formats = [ From bedffdcf01fe5cfb37880fe29f6104525b46e037 Mon Sep 17 00:00:00 2001 From: Jake Holland Date: Tue, 12 May 2015 19:00:19 -0700 Subject: [PATCH 2/4] bump version for another setup.py to link to it? --- youtube_dl/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/version.py b/youtube_dl/version.py index 83c5a1659..ca9c38897 100644 --- a/youtube_dl/version.py +++ b/youtube_dl/version.py @@ -1,3 +1,3 @@ from __future__ import unicode_literals -__version__ = '2015.05.10' +__version__ = '2015.05.12.j2' From ef2b544cac4ebfc3cf97a6d544d1c1a848e8c5be Mon Sep 17 00:00:00 2001 From: Jake Holland Date: Tue, 12 May 2015 19:27:47 -0700 Subject: [PATCH 3/4] still experimenting with making a tag i can build something else against --- setup.py | 4 ++-- youtube_dl/version.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 4686260e0..87af3ceb1 100644 --- a/setup.py +++ b/setup.py @@ -75,12 +75,12 @@ exec(compile(open('youtube_dl/version.py').read(), 'youtube_dl/version.py', 'exec')) setup( - name='youtube_dl', + name='jake_youtube_dl', version=__version__, description='YouTube video downloader', long_description='Small command-line program to download videos from' ' YouTube.com and other video sites.', - url='https://github.com/rg3/youtube-dl', + url='https://github.com/GrumpyOldTroll/youtube-dl', author='Ricardo Garcia', author_email='ytdl@yt-dl.org', maintainer='Philipp Hagemeister', diff --git a/youtube_dl/version.py b/youtube_dl/version.py index ca9c38897..6bf17a065 100644 --- a/youtube_dl/version.py +++ b/youtube_dl/version.py @@ -1,3 +1,3 @@ from __future__ import unicode_literals -__version__ = '2015.05.12.j2' +__version__ = '2015.05.12.j3' From 9c71d02fb88a9d91f6348b3559ea2d2aaad624fa Mon Sep 17 00:00:00 2001 From: Jake Holland Date: Thu, 14 May 2015 15:55:05 -0700 Subject: [PATCH 4/4] Revert unintentional pushed changes to setup.py and version.py. --- setup.py | 4 ++-- youtube_dl/version.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 87af3ceb1..4686260e0 100644 --- a/setup.py +++ b/setup.py @@ -75,12 +75,12 @@ exec(compile(open('youtube_dl/version.py').read(), 'youtube_dl/version.py', 'exec')) setup( - name='jake_youtube_dl', + name='youtube_dl', version=__version__, description='YouTube video downloader', long_description='Small command-line program to download videos from' ' YouTube.com and other video sites.', - url='https://github.com/GrumpyOldTroll/youtube-dl', + url='https://github.com/rg3/youtube-dl', author='Ricardo Garcia', author_email='ytdl@yt-dl.org', maintainer='Philipp Hagemeister', diff --git a/youtube_dl/version.py b/youtube_dl/version.py index 6bf17a065..83c5a1659 100644 --- a/youtube_dl/version.py +++ b/youtube_dl/version.py @@ -1,3 +1,3 @@ from __future__ import unicode_literals -__version__ = '2015.05.12.j3' +__version__ = '2015.05.10'