Merge tag 'upstream/2015.05.15'

[youtubedl] / youtube_dl / postprocessor / __init__.py

diff --git a/youtube_dl/postprocessor/__init__.py b/youtube_dl/postprocessor/__init__.py
index 6ac67cbaed2517d6c908634619c81e0a5bcf36d8..0d8ef6ca26c6ef7f1b7b402b387d20eebd3f8a8f 100644 (file)
--- a/youtube_dl/postprocessor/__init__.py
+++ b/youtube_dl/postprocessor/__init__.py
@@ -1,26 +1,38 @@
+from __future__ import unicode_literals

 
 

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

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

-    FFmpegAudioFixPP,

     FFmpegEmbedSubtitlePP,
     FFmpegExtractAudioPP,
     FFmpegEmbedSubtitlePP,
     FFmpegExtractAudioPP,

+    FFmpegFixupStretchedPP,
+    FFmpegFixupM4aPP,

     FFmpegMergerPP,
     FFmpegMetadataPP,
     FFmpegMergerPP,
     FFmpegMetadataPP,

-    FFmpegVideoConvertor,
+    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):
+    return globals()[key + 'PP']
+

 
 __all__ = [
 
 __all__ = [

-    'AtomicParsleyPP',
+    'EmbedThumbnailPP',

     'ExecAfterDownloadPP',
     'ExecAfterDownloadPP',

-    'FFmpegAudioFixPP',

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

+    'FFmpegFixupM4aPP',
+    'FFmpegFixupStretchedPP',

     'FFmpegMergerPP',
     'FFmpegMetadataPP',
     'FFmpegPostProcessor',
     'FFmpegMergerPP',
     'FFmpegMetadataPP',
     'FFmpegPostProcessor',

-    'FFmpegVideoConvertor',
+    'FFmpegSubtitlesConvertorPP',
+    'FFmpegVideoConvertorPP',
+    'MetadataFromTitlePP',

     'XAttrMetadataPP',
 ]
     'XAttrMetadataPP',
 ]