]> gitweb @ CieloNegro.org - youtube-dl.git/commit
Merge branch 'subtitles-rework'
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Mon, 23 Feb 2015 16:13:03 +0000 (17:13 +0100)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Mon, 23 Feb 2015 16:13:03 +0000 (17:13 +0100)
commitbfc993cc9183d5f001e30267551bcdf9f0a98be9
tree9408dc1e760394afdf8cbf6f48157ec22d7f3a74
parent4432db35d9ddd0e6777df6c596d8637514ba0b56
parentb531cfc019576b682f930bd269f68eb87cfd5abf
Merge branch 'subtitles-rework'

(Closes PR #4964)
Makefile
youtube_dl/YoutubeDL.py
youtube_dl/__init__.py
youtube_dl/extractor/common.py
youtube_dl/extractor/dailymotion.py
youtube_dl/extractor/ted.py
youtube_dl/extractor/theplatform.py
youtube_dl/extractor/vimeo.py
youtube_dl/extractor/youtube.py
youtube_dl/options.py
youtube_dl/postprocessor/ffmpeg.py