Merge tag 'upstream/2017.03.26'

[youtubedl] / youtube_dl / postprocessor / __init__.py

diff --git a/youtube_dl/postprocessor/__init__.py b/youtube_dl/postprocessor/__init__.py
index 0ffbca258587651fb5a4aaba9cede2c3f87d9fc5..3ea5183999d5ed2adacbb05bccc6af93e8ac6750 100644 (file)
--- a/youtube_dl/postprocessor/__init__.py
+++ b/youtube_dl/postprocessor/__init__.py
@@ -1,19 +1,21 @@
 from __future__ import unicode_literals
 
 from __future__ import unicode_literals
 

-from .atomicparsley import AtomicParsleyPP
+from .embedthumbnail import EmbedThumbnailPP

 from .ffmpeg import (
     FFmpegPostProcessor,
 from .ffmpeg import (
     FFmpegPostProcessor,

-    FFmpegAudioFixPP,

     FFmpegEmbedSubtitlePP,
     FFmpegExtractAudioPP,
     FFmpegFixupStretchedPP,
     FFmpegEmbedSubtitlePP,
     FFmpegExtractAudioPP,
     FFmpegFixupStretchedPP,

+    FFmpegFixupM3u8PP,

     FFmpegFixupM4aPP,
     FFmpegMergerPP,
     FFmpegMetadataPP,
     FFmpegVideoConvertorPP,
     FFmpegFixupM4aPP,
     FFmpegMergerPP,
     FFmpegMetadataPP,
     FFmpegVideoConvertorPP,

+    FFmpegSubtitlesConvertorPP,

 )
 from .xattrpp import XAttrMetadataPP
 from .execafterdownload import ExecAfterDownloadPP
 )
 from .xattrpp import XAttrMetadataPP
 from .execafterdownload import ExecAfterDownloadPP

+from .metadatafromtitle import MetadataFromTitlePP

 
 
 def get_postprocessor(key):
 
 
 def get_postprocessor(key):


@@ -21,16 +23,18 @@ def get_postprocessor(key):
 
 
 __all__ = [
 
 
 __all__ = [

-    'AtomicParsleyPP',
+    'EmbedThumbnailPP',

     'ExecAfterDownloadPP',
     'ExecAfterDownloadPP',

-    'FFmpegAudioFixPP',

     'FFmpegEmbedSubtitlePP',
     'FFmpegExtractAudioPP',
     'FFmpegEmbedSubtitlePP',
     'FFmpegExtractAudioPP',

+    'FFmpegFixupM3u8PP',

     'FFmpegFixupM4aPP',
     'FFmpegFixupStretchedPP',
     'FFmpegMergerPP',
     'FFmpegMetadataPP',
     'FFmpegPostProcessor',
     'FFmpegFixupM4aPP',
     'FFmpegFixupStretchedPP',
     'FFmpegMergerPP',
     'FFmpegMetadataPP',
     'FFmpegPostProcessor',

+    'FFmpegSubtitlesConvertorPP',

     'FFmpegVideoConvertorPP',
     'FFmpegVideoConvertorPP',

+    'MetadataFromTitlePP',

     'XAttrMetadataPP',
 ]
     'XAttrMetadataPP',
 ]