downloader: fix youtube video merge issue

iawia002 · May 15, 2020 · 5531a1c · 5531a1c
1 parent 5a7836a
commit 5531a1c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/downloader/downloader.go b/downloader/downloader.go
@@ -630,8 +630,8 @@ func (downloader *Downloader) Download(data *types.Data) error {
 	}
 
 	fmt.Printf("Merging video parts into %s\n", mergedFilePath)
-	if stream.Ext == "mp4" {
-		return utils.MergeToMP4(parts, mergedFilePath, title)
+	if stream.Ext != "mp4" || data.Site == "YouTube youtube.com" {
+		return utils.MergeFilesWithSameExtension(parts, mergedFilePath)
 	}
-	return utils.MergeFilesWithSameExtension(parts, mergedFilePath)
+	return utils.MergeToMP4(parts, mergedFilePath, title)
 }
diff --git a/utils/ffmpeg.go b/utils/ffmpeg.go
@@ -26,6 +26,7 @@ func runMergeCmd(cmd *exec.Cmd, paths []string, mergeFilePath string) error {
 }
 
 // MergeFilesWithSameExtension merges files that have the same extension into one.
+// Can also handle merging audio and video.
 func MergeFilesWithSameExtension(paths []string, mergedFilePath string) error {
 	cmds := []string{
 		"-y",