diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2015-02-28 20:51:54 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2015-02-28 20:51:54 +0100 |
| commit | 29cad7ad130c2e093c06d269c3b222e33adc218f (patch) | |
| tree | 58d6b44e87712e9c461b83f892dbd7d173214eed /youtube_dl/postprocessor/__init__.py | |
| parent | 1a2313a6f2d83c9e0a5c0c25bf5a2e3167994dbe (diff) | |
| parent | 0d103de3b0b03c5027f0015327c2c44b9073513a (diff) | |
| download | youtube-dl-29cad7ad130c2e093c06d269c3b222e33adc218f.tar.xz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'youtube_dl/postprocessor/__init__.py')
| -rw-r--r-- | youtube_dl/postprocessor/__init__.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/youtube_dl/postprocessor/__init__.py b/youtube_dl/postprocessor/__init__.py index 0ffbca258..708df3dd4 100644 --- a/youtube_dl/postprocessor/__init__.py +++ b/youtube_dl/postprocessor/__init__.py @@ -11,6 +11,7 @@ from .ffmpeg import ( FFmpegMergerPP, FFmpegMetadataPP, FFmpegVideoConvertorPP, + FFmpegSubtitlesConvertorPP, ) from .xattrpp import XAttrMetadataPP from .execafterdownload import ExecAfterDownloadPP @@ -31,6 +32,7 @@ __all__ = [ 'FFmpegMergerPP', 'FFmpegMetadataPP', 'FFmpegPostProcessor', + 'FFmpegSubtitlesConvertorPP', 'FFmpegVideoConvertorPP', 'XAttrMetadataPP', ] |