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 f8507951cea5b7b9cd4f9cf75b7024910c82a095..708df3dd493ca97e6d1649d572ac68a0d6847464 100644 (file)
--- a/youtube_dl/postprocessor/__init__.py
+++ b/youtube_dl/postprocessor/__init__.py
@@ -7,9 +7,11 @@ from .ffmpeg import (
     FFmpegEmbedSubtitlePP,
     FFmpegExtractAudioPP,
     FFmpegFixupStretchedPP,
     FFmpegEmbedSubtitlePP,
     FFmpegExtractAudioPP,
     FFmpegFixupStretchedPP,

+    FFmpegFixupM4aPP,

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

+    FFmpegSubtitlesConvertorPP,

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


@@ -25,10 +27,12 @@ __all__ = [
     'FFmpegAudioFixPP',
     'FFmpegEmbedSubtitlePP',
     'FFmpegExtractAudioPP',
     'FFmpegAudioFixPP',
     'FFmpegEmbedSubtitlePP',
     'FFmpegExtractAudioPP',

+    'FFmpegFixupM4aPP',

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

+    'FFmpegSubtitlesConvertorPP',

     'FFmpegVideoConvertorPP',
     'XAttrMetadataPP',
 ]
     'FFmpegVideoConvertorPP',
     'XAttrMetadataPP',
 ]