Merge tag 'upstream/2015.02.28'

[youtubedl] / youtube_dl / postprocessor / __init__.py

diff --git a/youtube_dl/postprocessor/__init__.py b/youtube_dl/postprocessor/__init__.py
index 08e6ddd00cbfe5691fb14943d6b2217748e96398..708df3dd493ca97e6d1649d572ac68a0d6847464 100644 (file)
--- a/youtube_dl/postprocessor/__init__.py
+++ b/youtube_dl/postprocessor/__init__.py
@@ -1,22 +1,38 @@
+from __future__ import unicode_literals

 
 from .atomicparsley import AtomicParsleyPP
 from .ffmpeg import (
 
 from .atomicparsley import AtomicParsleyPP
 from .ffmpeg import (

+    FFmpegPostProcessor,

     FFmpegAudioFixPP,
     FFmpegAudioFixPP,

+    FFmpegEmbedSubtitlePP,
+    FFmpegExtractAudioPP,
+    FFmpegFixupStretchedPP,
+    FFmpegFixupM4aPP,

     FFmpegMergerPP,
     FFmpegMetadataPP,
     FFmpegMergerPP,
     FFmpegMetadataPP,

-    FFmpegVideoConvertor,
-    FFmpegExtractAudioPP,
-    FFmpegEmbedSubtitlePP,
+    FFmpegVideoConvertorPP,
+    FFmpegSubtitlesConvertorPP,

 )
 from .xattrpp import XAttrMetadataPP
 )
 from .xattrpp import XAttrMetadataPP

+from .execafterdownload import ExecAfterDownloadPP
+
+
+def get_postprocessor(key):
+    return globals()[key + 'PP']
+

 
 __all__ = [
     'AtomicParsleyPP',
 
 __all__ = [
     'AtomicParsleyPP',

+    'ExecAfterDownloadPP',

     'FFmpegAudioFixPP',
     'FFmpegAudioFixPP',

+    'FFmpegEmbedSubtitlePP',
+    'FFmpegExtractAudioPP',
+    'FFmpegFixupM4aPP',
+    'FFmpegFixupStretchedPP',

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

-    'FFmpegVideoConvertor',
-    'FFmpegExtractAudioPP',
-    'FFmpegEmbedSubtitlePP',
+    'FFmpegPostProcessor',
+    'FFmpegSubtitlesConvertorPP',
+    'FFmpegVideoConvertorPP',

     'XAttrMetadataPP',
 ]
     'XAttrMetadataPP',
 ]