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 6ac67cbaed2517d6c908634619c81e0a5bcf36d8..708df3dd493ca97e6d1649d572ac68a0d6847464 100644 (file)
--- a/youtube_dl/postprocessor/__init__.py
+++ b/youtube_dl/postprocessor/__init__.py
@@ -1,3 +1,4 @@
+from __future__ import unicode_literals

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


@@ -5,22 +6,33 @@ from .ffmpeg import (
     FFmpegAudioFixPP,
     FFmpegEmbedSubtitlePP,
     FFmpegExtractAudioPP,
     FFmpegAudioFixPP,
     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
 

+
+def get_postprocessor(key):
+    return globals()[key + 'PP']
+
+

 __all__ = [
     'AtomicParsleyPP',
     'ExecAfterDownloadPP',
     'FFmpegAudioFixPP',
     'FFmpegEmbedSubtitlePP',
     'FFmpegExtractAudioPP',
 __all__ = [
     'AtomicParsleyPP',
     'ExecAfterDownloadPP',
     'FFmpegAudioFixPP',
     'FFmpegEmbedSubtitlePP',
     'FFmpegExtractAudioPP',

+    'FFmpegFixupM4aPP',
+    'FFmpegFixupStretchedPP',

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

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

     'XAttrMetadataPP',
 ]
     'XAttrMetadataPP',
 ]