Merge tag 'upstream/2016.02.22'

[youtubedl] / youtube_dl / postprocessor / __init__.py

diff --git a/youtube_dl/postprocessor/__init__.py b/youtube_dl/postprocessor/__init__.py
index 0ffbca258587651fb5a4aaba9cede2c3f87d9fc5..0d8ef6ca26c6ef7f1b7b402b387d20eebd3f8a8f 100644 (file)
--- a/youtube_dl/postprocessor/__init__.py
+++ b/youtube_dl/postprocessor/__init__.py
@@ -1,9 +1,8 @@
 from __future__ import unicode_literals
 
 from __future__ import unicode_literals
 

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

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

-    FFmpegAudioFixPP,

     FFmpegEmbedSubtitlePP,
     FFmpegExtractAudioPP,
     FFmpegFixupStretchedPP,
     FFmpegEmbedSubtitlePP,
     FFmpegExtractAudioPP,
     FFmpegFixupStretchedPP,


@@ -11,9 +10,11 @@ from .ffmpeg import (
     FFmpegMergerPP,
     FFmpegMetadataPP,
     FFmpegVideoConvertorPP,
     FFmpegMergerPP,
     FFmpegMetadataPP,
     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):
 
 
 def get_postprocessor(key):


@@ -21,9 +22,8 @@ def get_postprocessor(key):
 
 
 __all__ = [
 
 
 __all__ = [

-    'AtomicParsleyPP',
+    'EmbedThumbnailPP',

     'ExecAfterDownloadPP',
     'ExecAfterDownloadPP',

-    'FFmpegAudioFixPP',

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


@@ -31,6 +31,8 @@ __all__ = [
     'FFmpegMergerPP',
     'FFmpegMetadataPP',
     'FFmpegPostProcessor',
     'FFmpegMergerPP',
     'FFmpegMetadataPP',
     'FFmpegPostProcessor',

+    'FFmpegSubtitlesConvertorPP',

     'FFmpegVideoConvertorPP',
     'FFmpegVideoConvertorPP',

+    'MetadataFromTitlePP',

     'XAttrMetadataPP',
 ]
     'XAttrMetadataPP',
 ]