Merge branch 'subtitles-rework'

(Closes PR #4964)
2015-02-23 17:13:03 +01:00
parent 4432db35d9 b531cfc019
commit bfc993cc91
29 changed files with 532 additions and 554 deletions
--- a/youtube_dl/init.py
+++ b/youtube_dl/init.py
@@ -226,7 +226,6 @@ def _real_main(argv=None):
    if opts.embedsubtitles:
        postprocessors.append({
            'key': 'FFmpegEmbedSubtitle',
-            'subtitlesformat': opts.subtitlesformat,
        })
    if opts.xattrs:
        postprocessors.append({'key': 'XAttrMetadata'})