From 6d543d3a7a3cb33ad28bd5e82ee3f9123cf895c0 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Mon, 24 Jan 2022 10:42:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=97=B6=EF=BC=8C=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 auto_merge_video.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/auto_merge_video.py b/auto_merge_video.py
index aab98e8..fe655dc 100644
--- a/auto_merge_video.py
+++ b/auto_merge_video.py
@@ -10,7 +10,7 @@ template_video_part = {
     "start": "",
     "end": "",
     "part_start": "",
-    "duration": "",
+    "_duration_str": "",
 }
 template_current_video = {
     "parts": [],
@@ -31,15 +31,15 @@ def merge_video_parts_and_split(video):
     for part in video["parts"]:
         if part["part_start"] is None:
             raise Exception("视频片段part_start读取异常")
-        if prev_part["duration"] == "":
+        if prev_part["_duration_str"] == "":
             duration = float(part["part_start"]) - float(prev_part["part_start"])
             if duration <= 60:
                 raise Exception("视频片段duration过小")
-            prev_part["duration"] = str(duration)
+            prev_part["_duration_str"] = str(duration)
         new_filename = str(time.time())
         os.system(" ".join([
             "ffmpeg", "-y", "-i", "\"{filename}.{file_ext}\"".format_map(prev_part),
-            "-c copy", "-f mpegts", "-t {duration}".format_map(prev_part),
+            "-c copy", "-f mpegts", "-t {_duration_str}".format_map(prev_part),
             "\"{}.ts\"".format(new_filename)
         ]))
         os.system(" ".join([