Merge tag 'upstream/2014.06.19'

[youtubedl] / youtube_dl / postprocessor / __init__.py

diff --git a/youtube_dl/postprocessor/__init__.py b/youtube_dl/postprocessor/__init__.py
index 7f19f717f20dc3f6b76c4bbea9f89e12d5cb9b10..08e6ddd00cbfe5691fb14943d6b2217748e96398 100644 (file)
--- a/youtube_dl/postprocessor/__init__.py
+++ b/youtube_dl/postprocessor/__init__.py
@@ -1,5 +1,7 @@
 
 

+from .atomicparsley import AtomicParsleyPP

 from .ffmpeg import (
 from .ffmpeg import (

+    FFmpegAudioFixPP,

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


@@ -9,6 +11,8 @@ from .ffmpeg import (
 from .xattrpp import XAttrMetadataPP
 
 __all__ = [
 from .xattrpp import XAttrMetadataPP
 
 __all__ = [

+    'AtomicParsleyPP',
+    'FFmpegAudioFixPP',

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