Merge branch 'master' into aniyomi-mpv

aniyomiorg · Apr 1, 2022 · 895e822 · 895e822
2 parents cab9631 + 98b7e1d
commit 895e822
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/AnimeDownloader.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/AnimeDownloader.kt
@@ -485,10 +485,11 @@ class AnimeDownloader(
 
     private fun hlsObservable(video: Video, source: AnimeHttpSource, tmpDir: UniFile, filename: String): Observable<UniFile> {
         isFFmpegRunning = true
+        val escapedFilename = "${tmpDir.filePath}/$filename.mp4".replace("\"", "\\\"")
         val headers = video.headers ?: source.headers
-        val headerOptions = headers.joinToString("-headers ", "-headers ", " ") { "\"${it.first}: ${it.second}\"" }
+        val headerOptions = headers.joinToString("", "-headers '", "'") { "${it.first}: ${it.second}\r\n" }
         // TODO: Support other file formats here as well (ffprobe or something, idk)
-        val ffmpegOptions = FFmpegKitConfig.parseArguments(headerOptions + "-i \"${video.videoUrl}\"  -c copy \"${tmpDir.filePath}/$filename.mp4\"")
+        val ffmpegOptions = FFmpegKitConfig.parseArguments(headerOptions + " -i '${video.videoUrl}' -c copy \"$escapedFilename\"")
         val executeCallback = ExecuteCallback {
             if (it.state != SessionState.COMPLETED) tmpDir.findFile("$filename.mp4")?.delete()
         }