Merge tag 'upstream/2014.10.30'

[youtubedl] / youtube_dl / postprocessor / __init__.py

diff --git a/youtube_dl/postprocessor/__init__.py b/youtube_dl/postprocessor/__init__.py
index 08e6ddd00cbfe5691fb14943d6b2217748e96398..6ac67cbaed2517d6c908634619c81e0a5bcf36d8 100644 (file)
--- a/youtube_dl/postprocessor/__init__.py
+++ b/youtube_dl/postprocessor/__init__.py
@@ -1,22 +1,26 @@
 
 from .atomicparsley import AtomicParsleyPP
 from .ffmpeg import (
 
 from .atomicparsley import AtomicParsleyPP
 from .ffmpeg import (

+    FFmpegPostProcessor,

     FFmpegAudioFixPP,
     FFmpegAudioFixPP,

+    FFmpegEmbedSubtitlePP,
+    FFmpegExtractAudioPP,

     FFmpegMergerPP,
     FFmpegMetadataPP,
     FFmpegVideoConvertor,
     FFmpegMergerPP,
     FFmpegMetadataPP,
     FFmpegVideoConvertor,

-    FFmpegExtractAudioPP,
-    FFmpegEmbedSubtitlePP,

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

+from .execafterdownload import ExecAfterDownloadPP

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

+    'ExecAfterDownloadPP',

     'FFmpegAudioFixPP',
     'FFmpegAudioFixPP',

+    'FFmpegEmbedSubtitlePP',
+    'FFmpegExtractAudioPP',

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

+    'FFmpegPostProcessor',

     'FFmpegVideoConvertor',
     'FFmpegVideoConvertor',

-    'FFmpegExtractAudioPP',
-    'FFmpegEmbedSubtitlePP',

     'XAttrMetadataPP',
 ]
     'XAttrMetadataPP',
 ]