Mirroring
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl
1
0
Fork 0
Code Issues Releases Wiki Activity
3,495 Commits
10 Branches
1120 Tags
241 MiB
Commit Graph

2485 Commits (ba7678f9cc1099313f3fa9221538116a24e8e627)

Author SHA1 Message Date
Philipp Hagemeister d2fee313ec Merge remote-tracking branch 'diffycat/jpopsuki'
Philipp Hagemeister fa7f58e433 release 2014.01.03
Jaime Marquínez Ferrándiz 71cd2a571e [dreisat] Make ‘index.php’ optional in the url (fixes )
Philipp Hagemeister 7c094bfe2f Reveal a little bit more detail about what we cache ()
Philipp Hagemeister 0f30658329 Clarify --cache-dir ()
Jaime Marquínez Ferrándiz 31c1cf5a9d [soundcloud] recognize more players’ urls (fixes )
epitron e63fc1bed4 Added '--xattrs' option which writes metadata to the file's extended attributes using a youtube-dl postprocessor. 
Works on Linux, OSX, and Windows.
Jaime Marquínez Ferrándiz efa1739b74 [comedycentral] Recognize ‘video-collections’ urls ()
Jaime Marquínez Ferrándiz 5ffecde73f [mixcloud] Fix track url transformation (fixes ) 
‘/previews/‘ must be replaced with ‘/c/originals/‘ now.
Philipp Hagemeister 08d13955dd [wistia] Prefer original video format above all others 
We could also set up a formula which would weigh filesize/bitrate and vcodec/acodec (say, 1GB h264 < 3 GB MPEG2 < 2 GB h264), but that would get really messy real soon.
rzhxeo 531147dd5e [BlipTVIE] Extract all formats
Philipp Hagemeister eadaf08c16 Merge remote-tracking branch 'origin/master'
Anton Larionov 4a9c9b6fdb [jpopsuki] Add script encoding definition for python2
Anton Larionov b969ab48d9 Add support for jpopsuki.tv
Jaime Marquínez Ferrándiz 8fa8a6299b [youtube] Add itag 264 (closes ) 
It has a better bitrate than 137 but the same resolution
Jaime Marquínez Ferrándiz b2b0870b3a [dreisat] Update test filename and checksum
Jaime Marquínez Ferrándiz 4fb757d1e0 Merge pull request from dstftw/imdb-list 
[imdb] Add support for IMDb list ()
Jaime Marquínez Ferrándiz 241bce7aaf Merge pull request from rzhxeo/var 
Correct variable name in YoutubeDL.list_formats
Philipp Hagemeister 33ec2ae8d9 Merge remote-tracking branch 'origin/master'
Jaime Marquínez Ferrándiz c801b2051a Add an extractor for cmt.com (closes ) 
It just inherits from MTVIE.
Some videos also come from vevo.com
Jaime Marquínez Ferrándiz 7976fcac55 [http] Fix ‘err’ variable not being assigned in an except block ()
Jaime Marquínez Ferrándiz e9f9a10fba Fix initialization of YoutubeDL with params set to None 
Set it to an empty dictionary because it’s directly accessed when setting some properties
rzhxeo 1cdfc31e1f Correct variable name in YoutubeDL
rzhxeo 19dab5e6cc [GenericIE] Outsource embedded blip.tv player video id extraction to BlipTVIE and fix minor errors in RegEx
rzhxeo c0f9969b9e [BlipTVIE] Fix and simplify extraction of embedded videos
Philipp Hagemeister a0ddb8a2fa Add new --print-traffic option
Philipp Hagemeister c1d1facd06 [generic] Output something before making network requests
Philipp Hagemeister b26559878f release 2013.12.26
Philipp Hagemeister fd46a318a2 Print out encoding information in -v ()
Philipp Hagemeister 5d4f3985be Document that format_id field should be present
Philipp Hagemeister 360babf799 [theplatform] Use centralized sorting
Philipp Hagemeister a1b92edbb3 [channel 9] Use centralized format sorting
Philipp Hagemeister 12c978739a [internetvideoarchive] Use centralized format sorting
Philipp Hagemeister 4bc60dafeb [blinkx] Use centralized format sorting
Philipp Hagemeister bf5b0a1bfb [ivi] Use centralized format sorting
Philipp Hagemeister bfe9de8510 [youporn] Add support for multiple formats
Philipp Hagemeister 5ecd3c6a09 [bandcamp] Add support for multiple formats
Philipp Hagemeister 608d11f515 [cnn] Add multiple formats, duration, and upload_date
dst c7f8537dd9 [lynda] Add support for lynda.com ()
Philipp Hagemeister 723f839911 Remove unused imports
Philipp Hagemeister 61224dbcdd [zdf] Make width extraction more robust
Philipp Hagemeister c3afc93a69 Merge remote-tracking branch 'origin/master'
Philipp Hagemeister 7b8af56340 [appletrailers] Use centralized format selection
Philipp Hagemeister 539179f45b [wistia] Use centralized sorting
Philipp Hagemeister 7217e148fb [yahoo] Use centralized sorting, and add tbr field
dst 1e923b0d29 [macgamestore] Add extractor ()
dst f7e9d77f34 [smotri] Fix typo
dst c645c7658d [imdb] Extractor for lists ()
Philipp Hagemeister b874fe2da8 [mdr] Use centralized format selection
Philipp Hagemeister c7deaa4c74 [zdf] Use centralized sorting
Philipp Hagemeister e6812ac99d [spiegel] Use centralized sorting
Philipp Hagemeister 719d3927d7 [mit] Add support for multiple formats
Philipp Hagemeister 55e663a8d7 [dreisat] Use centralized format sorting
Philipp Hagemeister 2c62dc26c8 [youtube] Simplify format specification
Philipp Hagemeister 4bcc7bd1f2 Add temporary _sort_formats helper function
Philipp Hagemeister f49d89ee04 Add a resolution field and improve general --list-formats output
Philipp Hagemeister dabc127362 Remove dead code
Philipp Hagemeister c25c991809 [mplayer] Fix error introduced by downloader separation
Philipp Hagemeister f45f96f8f8 [myvideo] Use RTMP instead of RTMPT (Fixes )
Philipp Hagemeister 1538eff6d8 [bliptv] Remove support for direct downloads 
This is now handled by the generic IE
Jaime Marquínez Ferrándiz 933605d7e8 YoutubeDL: rename `_fd_progress_hooks` back to `_progress_hooks` 
In the future it may report more things.
Jaime Marquínez Ferrándiz b3d9ef88ec YoutubeDL: only set the ‘formats’ field of the info_dict if it was already set before 
It caused a circular reference error, when trying to dump it to json (for example with the test video for myvideo.de or any other video without formats)
Philipp Hagemeister 8958b6916c release 2013.12.23.4
Philipp Hagemeister 9fc3bef87a Merge remote-tracking branch 'jaimeMF/split-downloaders'
Philipp Hagemeister d80044c235 [youtube] Prefer videos with sound
Philipp Hagemeister bc2103f3bf release 2013.12.23.3
Philipp Hagemeister f82b18efc1 Merge remote-tracking branch 'rzhxeo/youtube'
Philipp Hagemeister 504c668d3b release 2013.12.23.2
Philipp Hagemeister 466617f539 [bliptv] Simplify (From )
Philipp Hagemeister 196938835a Remove debugging code 
Introduced by accident in 5d681e960d
Philipp Hagemeister a94e129a65 release 2013.12.23.1
Philipp Hagemeister 5d681e960d Use bidiv instead of fribidi if available (Fixes )
Philipp Hagemeister c7b487d96b release 2013.12.23
Philipp Hagemeister 7dbf5ae587 [smotri] Add support for moderated (?) videos (Fixes )
Philipp Hagemeister 8d0bdeba18 [smotri] Make optional attributes optional
Philipp Hagemeister 1b969041d7 [blinkx] Support mobile URLs (Closes )
Philipp Hagemeister e302f9ce32 [youtube:user] Speed up --match-title
Philipp Hagemeister 5a94982abe Remove unused import
Philipp Hagemeister 7115ca84aa [vimeo/generic] Add support for embedded SWF vimeo videos
Philipp Hagemeister 04ff34ab89 Show all matching URLs
Philipp Hagemeister bbafbe20c2 [vimeo] Better formatting for regexp
Philipp Hagemeister c4d55a33fc [brightcove] Test checksum changed
Philipp Hagemeister 147e4aece0 [vbox7] New video checksum
Philipp Hagemeister bd1488ae64 [mdr] Remove test 
For context, refer to the http://de.wikipedia.org/wiki/Depublizieren
Philipp Hagemeister 79fed2a4df [crunchyroll] Fix test ()
Philipp Hagemeister 304cbe981e Merge remote-tracking branch 'rzhxeo/crunchyroll'
Philipp Hagemeister 3fefbf50e3 Merge pull request from dstftw/ivi.ru 
Add support for ivi.ru
Philipp Hagemeister f65c1d2be0 release 2013.12.20
Philipp Hagemeister aa94a6d315 [aparat] Add support (Fixes )
Jaime Marquínez Ferrándiz 768df74538 [blinkxx] Add support for youtube videos
Philipp Hagemeister 1f9da9049b [generic] Support YouTube swf embed (Fixes )
Jaime Marquínez Ferrándiz c0d0b01f0e [generic] Detect ooyala videos (fixes )
dst 97e302a419 [imdb] Add support for mobile site URLs
Philipp Hagemeister 71507a11c8 [soundcloud] Support mobile URLs (Fixes )
dst a51e37af62 [ivi] Simplify
dst 6c6db72ed4 [ivi] Skip tests for travis build
dst 0cc83dc54b [smotri] Fix duration field name
dst 77aa6b329d [ivi] Add support for ivi.ru
rzhxeo 62d68c43ed Make prefer_free_formats sorting more robust
rzhxeo bfaae0a768 Filter and sort videos before calling list_formats
rzhxeo e56f22ae20 [YoutubeIE] Sort formats by resolution
rzhxeo dbd1988ed9 [YoutubeIE] Add width and height to format dict
rzhxeo 4ea3be0a5c [YoutubeIE] Externalize format selection
Philipp Hagemeister 3e78514568 [generic] Support application/ogg for direct links 
Also remove some debugging code.
Philipp Hagemeister e029b8bd43 [utils] Remove duplicated line 
This line was added by accident in 42393ce234
Jaime Marquínez Ferrándiz 9b8aaeed85 Simplify url_basename 
Use urlparse from the standard library.
Philipp Hagemeister 6086d121cb release 2013.12.17.2
Philipp Hagemeister 7de6e075b4 [radiofrance] remove unused imports
Philipp Hagemeister 946135aa2a [academicearth] remove unused imports
Philipp Hagemeister 42393ce234 Add support for direct links to a video ()
Philipp Hagemeister d6c7a367e8 [utils] Fix url_basename
Philipp Hagemeister cecaaf3f58 [generic] Do not use compatibility result fallback
Philipp Hagemeister f09828b4e1 release 2013.12.17.1
Philipp Hagemeister 29eb517403 Add webpage_url_basename info_dict field (Fixes )
Philipp Hagemeister 44c471c3b8 release 2013.12.17
Philipp Hagemeister 46374a56b2 [youtube] Do not warn for videos with allow_rating=0 
This fixes 
Test video: http://www.youtube.com/watch?v=gi2uH3YxohU
Philipp Hagemeister ec98946ef9 [academicearth] Support playlists (Closes )
Philipp Hagemeister fa77b742ac [radiofrance] Fill in test details
Philipp Hagemeister 8b4e274610 [rtlnow] Fix URL calculation (Closes )
Philipp Hagemeister 11b68f6e1b release 2013.12.16.7
Philipp Hagemeister 88bb52ee18 Merge branch 'master' of github.com:rg3/youtube-dl
Philipp Hagemeister d90df974c3 [academicearth] Add support for courses ()
Jaime Marquínez Ferrándiz 5c541b2cb7 [mtv] Add support for urls from the mobile site (fixes )
Itay Brandes 87a28127d2 _search_regex's "isatty" call fails with Py2exe's 
_search_regex calls the sys.stderr.isatty() function for unix systems.

Py2exe uses a custom Stderr() stream which doesn't have an `isatty()`
function, leading to it's crash.

Fixes easily with checking that it's a unix system first.
Philipp Hagemeister ebce53b3d8 [vevo] Add suppor for videoplayer. URLs ()
Philipp Hagemeister 83c632dc43 release 2013.12.16.6
Philipp Hagemeister ff07a05575 Merge branch 'master' of github.com:rg3/youtube-dl
Philipp Hagemeister f25571ffbf Add support for embedded vevo player (Fixes )
Jaime Marquínez Ferrándiz f7a6892572 [arte:ddc] Remove test 
video seems to expire in 7 days, as arte+7
Philipp Hagemeister 8fe56478f8 release 2013.12.16.5
Philipp Hagemeister 0e2a436dce [radiofrance] Add support (Fixes )
Philipp Hagemeister 24050dd11c release 2013.12.16.4
Philipp Hagemeister 8c8e3eec79 [facebook] Recognize #! URLs (Fixes )
rzhxeo ee3e63e477 [GenericIE] Add support for embedded blip.tv
alimirjamali 0a9ce268ba Incorrect variable is used to check whether thumbnail exists 
Dear @phihag

I believe in line 848, the correct variable to check is 'thumb_filename' rather than 'infofn'

Kindly advise

Mit freundlichen Gruessen
Ali
Philipp Hagemeister 4b2da48ea7 release 2013.12.16.3
Philipp Hagemeister e64eaaa97d Fix execution under Python 3
Philipp Hagemeister 780603027f [videopremium] Skip test
Philipp Hagemeister 00902cd601 release 2013.12.16.2
Philipp Hagemeister d67b0b1596 Reorder info_dict documentation
Philipp Hagemeister d7dda16888 [blinkx] Add extractor (Fixes )
Philipp Hagemeister a19fd00cc4 Simplify --playlist-start / --playlist-end interface
Philipp Hagemeister d66152a898 [ndtv] Remove unused imports
Philipp Hagemeister 8c5f0c9fbc [mdr] Clean up
Philipp Hagemeister 6888a874a1 release 2013.12.16.1
Philipp Hagemeister 09dacfa57f [mdr] Simplify
Philipp Hagemeister b2ae513586 Merge remote-tracking branch 'mc2avr/master'
Philipp Hagemeister e4a0489f6e Merge remote-tracking branch 'dstftw/channel9' 
Conflicts:
	youtube_dl/extractor/__init__.py
Philipp Hagemeister b83be81d27 Credit @mjorlitzky for pornhd ()
Philipp Hagemeister 6f5dcd4eee [pornhd] Simplify
Philipp Hagemeister 1bb2fc98e0 Merge remote-tracking branch 'mjorlitzky/master'
Philipp Hagemeister e3946f989e Set process title to youtube-dl 
This allows killing all youtube-dl processes with killall youtube-dl, and shows up nicer in some programs.
Philipp Hagemeister 8863d0de91 release 2013.12.16
Philipp Hagemeister 7b6fefc9d4 Apply --no-overwrites for --write-* files as well (Fixes )
Philipp Hagemeister 525ef9227f Add --get-duration (Fixes )
Philipp Hagemeister c0ba0f4859 Document duration field
Philipp Hagemeister b466b7029d [youtube] Make duration an integer or None
Philipp Hagemeister fa3ae234e0 [cbs] Add extractor (Fixes )
Philipp Hagemeister 48462108f3 [theplatform] Fix geographic restriction check
Philipp Hagemeister f8b56e95b8 [theplatform] Detect geoblocked content
Philipp Hagemeister 5fe18bdbde Add --min-views / --max-views (Fixes )
Jaime Marquínez Ferrándiz dca02c80bc Fix detection of the extension if the 'extractaudio' is given and improve the error message () 
Using 'foo.mp4' shouldn't raise an error.
If 'foo' is given suggest using 'foo.%(ext)s' for the template
Jaime Marquínez Ferrándiz 9ee859b683 [daylimotion] Add support for urls from the mobile site (fixes ) 
It uses the 'touch' subdomain and adds a '#' before 'video'
Michael Orlitzky 8e05c870b4 Add support for pornhd.com.
Jaime Marquínez Ferrándiz 5d574e143f [ign] Update one of test video's title
Philipp Hagemeister 2a203a6cda Merge pull request from dstftw/master 
Fix typo in month name
dst dadb8184e4 Fix typo in month name
Jaime Marquínez Ferrándiz 7a563df90a [daum] Recognize mobile urls ()
Jaime Marquínez Ferrándiz 24b173fa5c [naver] Recognize mobile urls (fixes )
dst 9b17ba0fa5 [channel9] Fix test description md5
dst 211f555d4c [channel9] Missing import in __init__
dst 4d2ebb6bd7 [channel9] Cleanup
dst df53747436 [channel9] Initial implementation ()
Jaime Marquínez Ferrándiz 3bc2ddccc8 Move FileDownloader to its own module and create a new class for each download process 
A suitable downloader can be found using the 'get_suitable_downloader' function.

Each subclass implements 'real_download', for downloading an info dict you call the 'download' method, which first checks if the video has already been downloaded
Jaime Marquínez Ferrándiz 8ab470f1b2 Now a new FileDownloader is created when downloading a video 
The progress hooks can be added using the method "add_downloader_progress_hook"
Philipp Hagemeister f2c36ee43e release 2013.12.11.2
Philipp Hagemeister 00381b4ccb [pornhub] Fix URL regexp
Philipp Hagemeister fca1ef19c1 release 2013.12.11.1
Philipp Hagemeister 357ddadbf5 Fix thumbnail filename determination (Fixes )
Philipp Hagemeister 08d03235f9 release 2013.12.11
Jaime Marquínez Ferrándiz 1825836235 Use `_download_xml` in more extractors
Jaime Marquínez Ferrándiz a0088bdf93 [vimeo] Fix unused argument of the `_real_extract` method
Jaime Marquínez Ferrándiz 48ad51b243 [vimeo] Fix the extraction for some 'player' or 'pro' videos 
The variable the config dict is assigned to can change, now we try to detect it or fallback to a, b or c
Jaime Marquínez Ferrándiz 5458b4cefb [dailymotion] Fix view count extraction and make it non fatal (fixes )
Jaime Marquínez Ferrándiz 7c86cd5ab1 [dailymotion] Fix uploader extraction 
Now it looks directly in the info dictionary
mc2avr df1d7da2af add MDRIE
Jaime Marquínez Ferrándiz cbfc470228 [mixcloud] Try to get the m4a url if the mp3 url fails to download (fixes )
Jaime Marquínez Ferrándiz f67ca84d4a [soundcloud] Fix the extension for 'downloadable' songs 
In this case the 'original_format' field must be used.
Philipp Hagemeister e2b38da931 [mtv] Fixup incorrectly encoded XML documents
Philipp Hagemeister a30a60d8eb release 2013.12.10
Philipp Hagemeister 5a3ea17c94 [zdf] Correct order of unknown formats ()
Philipp Hagemeister 475700acfe [soundcloud] Do not mistake original_format for ext (Fixes )
Philipp Hagemeister 45598aab08 [YoutubeDL] Simplify filename preparation
Jaime Marquínez Ferrándiz 26e6393134 Set 'NA' as the default value for missing fields in the output template (fixes ) 
Remove the `except KeyError` clause, it won't get raised anymore
Philipp Hagemeister 49929a20a7 release 2013.12.09.4
Philipp Hagemeister f8bd0194a7 Remove superfluous spaces
Jaime Marquínez Ferrándiz 77526143e7 [brightcove] Use the original url (usually the player) as the default referer (fixes )
Philipp Hagemeister 4ff50ef846 [soundcloud] Do not match sets (Fixes )
Philipp Hagemeister caefb1de87 [ndtv] Add extractor (Fixes )
Philipp Hagemeister 1e1f84dac9 release 2013.12.09.3
Philipp Hagemeister 1d87e3a1c6 [rtlnow] Allow double slashes after domain name (Fixes )
Philipp Hagemeister df8ae1e3a2 release 2013.12.09.2
Philipp Hagemeister f7d8d4a116 Merge branch 'master' of github.com:rg3/youtube-dl
Philipp Hagemeister 1c088fa89d Improve --bidi-workaround support
Jaime Marquínez Ferrándiz de2dd4c502 [soundcloud] add support for private links (fixes )
Philipp Hagemeister 395293a889 [--load-info] Always read file as UTF-8 
This allows editing the file (and not escaping non-ASCII characters) and reloading it in.
Philipp Hagemeister db4da14027 Merge remote-tracking branch 'jaimeMF/load-info'
Philipp Hagemeister 2101830c0d Remove unused imports
Philipp Hagemeister ffa8f0df0a Merge remote-tracking branch 'jaimeMF/yt-toplists'
Philipp Hagemeister 693b8b2d31 Merge remote-tracking branch 'dstftw/smotri.com-broadcast' 
Conflicts:
	youtube_dl/FileDownloader.py
	youtube_dl/extractor/smotri.py
Philipp Hagemeister a0d96c9843 Add filename to --dump-json output (Fixes )
Philipp Hagemeister eaa1a7bde3 release 2013.12.09.1
Philipp Hagemeister 0783b09b92 Add a workaround for terminals without bidi support (Fixes )
Philipp Hagemeister ffe62508e4 release 2013.12.09
Philipp Hagemeister ac79fa02b8 Restore Python 2.6.<6 compatibility (Fixes )
Philipp Hagemeister 7cc3570e53 Add fatal=False parameter to _download_* functions. 
This allows us to simplify the calls in the youtube extractor even further.
Jaime Marquínez Ferrándiz baa7b1978b Remove the calls to 'compat_urllib_request.urlopen' in a few extractors
Jaime Marquínez Ferrándiz ac5118bcb9 [arte.tv:ddc] Add fields to the test and skip download (rtmp)
Camillo Dell'mour 52defb0c9b made ddc.arte.tv test working
Camillo Dell'mour 56a8ab7d60 added arte.tv extractor support for subdomain ddc - Mit offenen Karten(german) Le Dessous des Cartes(france)
Philipp Hagemeister 22686b91f0 release 2013.12.08.1
Philipp Hagemeister 31812a9e0e [youtube:channel] Fix automated channel detection
Philipp Hagemeister 11bf848191 [wimp] simplify
Philipp Hagemeister d4df5ed14c release 2013.12.08
Philipp Hagemeister 303b479e0a Automatically load SSL certs on Windows
Philipp Hagemeister 4c52160646 [FileDownloader] Fix progress report on Windows (Fixes )
Philipp Hagemeister a213880aaf Simplify status reporting ()
rzhxeo b860967ce4 [XHamsterIE] Fix md5 in second test
rzhxeo 8ca6b8fba1 [XHamsterIE] Fix HD video detection
Jaime Marquínez Ferrándiz c4d9e6731a [pyvideo] add support for videos that don't come from Youtube
Jaime Marquínez Ferrándiz 0d9ec5d963 [pyvideo] Cleanup and fix test
Adam Glenn f623530d6e removing bad VALID_URL
Adam Glenn ca9e02dc00 Adding pyvideo support
Jaime Marquínez Ferrándiz fb30ec22fd [vimeo] Add an extractor for groups
Jaime Marquínez Ferrándiz 5cc14c2fd7 [vimeo] Add an extractor for albums (closes )
Jaime Marquínez Ferrándiz d349cd2240 [imdb] Fix extraction 
The paths to each format's page may have leading whitespace.
The height and the duration can't be extracted.
Jaime Marquínez Ferrándiz 0b6a9f639f [vevo] Update test video's duration
Jaime Marquínez Ferrándiz 715c8e7bdb [youtube:playlist] Recognize mix ids for direct use (fixes )
Jaime Marquínez Ferrándiz 7d4afc557f [youtube:playlist] Support mix ids longer than 13 ()
Jaime Marquínez Ferrándiz 563e405411 [dailymotion] Fix view count regex 
In some languages they can be in the format '123,456' instead of '123.456'
Jaime Marquínez Ferrándiz f53c966a73 [dailymotion] Extract view count ()
Jaime Marquínez Ferrándiz 336c3a69bd [youtube] Extract like and dislike count ()
Jaime Marquínez Ferrándiz 4e76179476 [vimeo] Extract views count, likes count and comments count ()
Philipp Hagemeister ef4fd84857 [wistia] Add extractor
Philipp Hagemeister 72135030d1 Merge remote-tracking branch 'origin/master'
Jaime Marquínez Ferrándiz 3514813d5b [francetv] Add support for urls in the format http://www.france3.fr/emissions/{program}/diffusions/{date} (fixes )
Jaime Marquínez Ferrándiz 9e60602084 [francetv] Add support for more channels: 3, 4, 5 and Ô () 
Rename the France2IE extractor to FranceTVIE
Philipp Hagemeister 19e3dfc9f8 [9gag] Like/dislike count ()
Philipp Hagemeister a1ef7e85d6 Remove unused imports
Philipp Hagemeister ef2fac6f4a Merge branch 'master' of github.com:rg3/youtube-dl