Commit Graph

160 Commits (3f0852e35fbe3fbd2f635daadb02425608db5cf2)

Author SHA1 Message Date
Tom-Oliver Heidel 4c7d0c13e1 Merge branch 'fix-mitele' of https://github.com/DjMoren/youtube-dl
Tom-Oliver Heidel acdb1a4ec6 Merge branch 'arbitrary-merges' of https://github.com/fstirlitz/youtube-dlc
felix d03cfdce1b Support arbitrary stream merges
With this change, the merge operator may join any number of media streams,
video or audio. The streams are downloaded in the order specified.

Also, fix the metadata post-processor so that it doesn't leave out
any streams.
Unknown e69dd78090 merge ytdl-master
Tom-Oliver Heidel 3796554609
Merge pull request from blackjack4494/gdcvault-fix
[gdcvault] fix extractor
Unknown 4b819d1454 flake8
Unknown 10bbf2c48d [skip travis] bump version
Tom-Oliver Heidel acd0a71894
Merge pull request from blackjack4494/kakao-new-apis
[kakao] new apis
Tom-Oliver Heidel d8edca1e56
Merge pull request from blackjack4494/daserste-ndr
[ndr] support Daserste ndr
Unknown 4cd3053c4f [kakao] new apis
there are also ageLimit and GeoBlock attributes provided by api_json if needed
Unknown f791b41970 flake8
Unknown 57df9f53e0 [youtube] convert subtitles with --skip-download
Unknown 84da5d84b0 add json3 back but don't use it as default.
Unknown fc0999c695 exclude json3 for now
Unknown d23f9ec7eb [gdcvault] fix extractor
at least when not logged in?
felix de7c27cd25 [dispeak] mark the "slides" stream as video-only
Unknown ac4df0908a [skip travis] bump version
Tom-Oliver Heidel 6cef08ad00 Merge branch 'tiktok' of https://github.com/skyme5/youtube-dl into skyme5-tiktok
Tom-Oliver Heidel df38b4a1a9 Merge branch 'pr/duboku' of https://github.com/lkho/youtube-dl into lkho-pr/duboku
Tom-Oliver Heidel ca640230de Merge branch 'alura' of https://github.com/hugohaa/youtube-dl into hugohaa-alura
Tom-Oliver Heidel 310f762636 Merge branch '26564' of https://github.com/adrianheine/youtube-dl into adrianheine-26564
Tom-Oliver Heidel 23306df2d8 Merge branch 'master' of https://github.com/ddland/youtube-dl into ddland-master
Tom-Oliver Heidel bb1d0b26ed Merge branch 'patch-2' of https://github.com/nixxo/youtube-dl into nixxo-patch-2
Unknown 55e106d1b0 Merge remote-tracking branch 'origin/master'
Tom-Oliver Heidel 0f0762a761 Merge branch 'myvideo_ge' of https://github.com/fonkap/youtube-dl into fonkap-myvideo_ge
Tom-Oliver Heidel 4d0d5e37f9
Merge pull request from blackjack4494/viki-subtitles_and_more
[Viki] subtitles, formats
Tom-Oliver Heidel d153de9d10 Merge branch 'rai-update' of https://github.com/iamleot/youtube-dl into iamleot-rai-update
Tom-Oliver Heidel e61b2178eb Merge branch 'JensTimmerman-patch-1' of https://github.com/JensTimmerman/youtube-dl into JensTimmerman-JensTimmerman-patch-1
Unknown 39e7107d7f Merge branch 'ytdl-org-master'
Tom-Oliver Heidel 448f4b70c6 Merge branch 'fix/google-drive-cookie-issue' of https://github.com/legraphista/youtube-dl into legraphista-fix/google-drive-cookie-issue
Unknown 4ae68091bb [soundcloud] flake8
Unknown 921dc153f3 [ndr-daserste] flake8
Unknown dc9d8f44d6 [daserste-ndr] dirty workaround
what a mess..
Unknown 169bd46bdc [viki] subtitles, formats
Unknown 389709160c [soundcloud] playlist limit per page according to official docs
https://github.com/ytdl-org/youtube-dl/pull/26557
Tom-Oliver Heidel cb2ea2d5ef Merge branch 'rutv' of https://github.com/adrianheine/youtube-dl into adrianheine-rutv
Tom-Oliver Heidel 10a4858d8f Merge branch 'magenta' of https://github.com/adrianheine/youtube-dl into adrianheine-magenta
Tom-Oliver Heidel baf36445c1 Merge branch 'ard.py_add_playlist_support' of https://github.com/martin54/youtube-dl into martin54-ard.py_add_playlist_support
Unknown 2045de7c32 [skip travis] bump version
Tom-Oliver Heidel 65f5a72266 Merge branch 'ondemandkorea' of https://github.com/julien-hadleyjack/youtube-dl into julien-hadleyjack-ondemandkorea
Unknown bc842c27a7 flake8 fix + soundcloud tests
Tom-Oliver Heidel 3c0c0b428d Merge branch 'mkvthumbnail' of https://github.com/MrDoritos/youtube-dl into MrDoritos-mkvthumbnail
Tom-Oliver Heidel a74727e93c Merge branch 'abc' of https://github.com/adrianheine/youtube-dl into adrianheine-abc
Unknown b54d0e702a Merge remote-tracking branch 'origin/master'
Tom-Oliver Heidel 9aa79d6460 Merge branch 'master' of https://github.com/zubearc/youtube-dl into zubearc
NotFound 7078ec64b3 [hotstar] Move to API v1
Tom-Oliver Heidel 51f8793699 Merge branch 'deezer' of https://github.com/LucBerge/youtube-dl into LucBerge-deezer
Tom-Oliver Heidel 47b9774231 Merge branch 'wdr-subtitles' of https://github.com/mrtnmtth/youtube-dl into mrtnmtth-wdr-subtitles
Unknown 906f980a75 [soundcloud] sets pattern and tests
include tests (weekly + charts)
weekly with login worked before. but now also public weekly will work. charts and similar patterned sets as well
Tom-Oliver Heidel e908c55c9f Merge branch 'tvnow' of https://github.com/TinyToweringTree/youtube-dl into TinyToweringTree-tvnow
Unknown 633c2852fb [skip travis] twitch release.
Tom-Oliver Heidel dac4ecf592 Merge branch 'twitch-fix' of https://github.com/lel-amri/youtube-dl into lel-amri-twitch-fix
Unknown 92dcea3d94 [skip travis] versioning in pypi is fun..
Unknown c8ba06b7b6 bumping version
Tom-Oliver Heidel 22f9b078fd Merge branch 'master' of https://github.com/ssaqua/youtube-dl into ssaqua-master
Unknown 3ca3f77f9c [skip travis] adding automerge support
basically copying content of youtube_dl folder to youtube_dlc and excluding the youtube_dl folder when compiling
Unknown 8c5fee2ea5 fix merge.
Unknown 3867038a06 renaming issues resolved
Unknown 66f4ffbbad [skip travis] update version to dev
Unknown cefecac12c [skip travis] renaming
to avoid using same folder when using pip install for example