Sergey M․ 98b8ec8616 Merge branch 'best-fallback-on-outdated-avconv' of https://github.com/dstftw/youtube-dl into dstftw-best-fallback-on-outdated-avconv ...

Conflicts:
	youtube_dl/YoutubeDL.py

2015-05-14 15:18:58 +06:00

..

downloader

…

extractor

[canalplus] Restore checksums in tests

2015-05-14 14:59:27 +06:00

postprocessor

Merge branch 'best-fallback-on-outdated-avconv' of https://github.com/dstftw/youtube-dl into dstftw-best-fallback-on-outdated-avconv

2015-05-14 15:18:58 +06:00

__init__.py

[postprocessor/embedthumbnail] Use thumbnails downloaded by YoutubeDL

2015-05-14 02:32:00 +08:00

__main__.py

…

aes.py

…

cache.py

…

compat.py

…

jsinterp.py

…

options.py

…

swfinterp.py

…

update.py

…

utils.py

[utils,common] Merge format_srt_time and _subtitles_timecode

2015-05-12 13:04:54 +08:00

version.py

…

YoutubeDL.py

Merge branch 'best-fallback-on-outdated-avconv' of https://github.com/dstftw/youtube-dl into dstftw-best-fallback-on-outdated-avconv

2015-05-14 15:18:58 +06:00