aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/PostProcessor.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-01-05 02:06:48 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-01-05 02:06:48 +0100
commita015dce0e243b48ca2124f82bfe40b579412484d (patch)
treec5a32960835de3f55ec50c69d0791633d14b05f3 /youtube_dl/PostProcessor.py
parent28ab2e48ae189d72fa1ac36a0cb81b5680cc82a9 (diff)
parent6350728be2cb9567c5845fa3d189b94d41d41be4 (diff)
downloadyoutube-dl-a015dce0e243b48ca2124f82bfe40b579412484d.tar.xz
Merge remote-tracking branch 'jaimeMF/merge-formats'
Diffstat (limited to 'youtube_dl/PostProcessor.py')
-rw-r--r--youtube_dl/PostProcessor.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/youtube_dl/PostProcessor.py b/youtube_dl/PostProcessor.py
index 097e1a9e4..14471a9ed 100644
--- a/youtube_dl/PostProcessor.py
+++ b/youtube_dl/PostProcessor.py
@@ -508,3 +508,11 @@ class FFmpegMetadataPP(FFmpegPostProcessor):
os.remove(encodeFilename(filename))
os.rename(encodeFilename(temp_filename), encodeFilename(filename))
return True, info
+
+
+class FFmpegMergerPP(FFmpegPostProcessor):
+ def run(self, info):
+ filename = info['filepath']
+ args = ['-c', 'copy']
+ self.run_ffmpeg_multiple_files(info['__files_to_merge'], filename, args)
+ return True, info