From d2dfee949be03af0918800118c0f7d3874e6dec2 Mon Sep 17 00:00:00 2001
From: YILS <yils_lin@163.com>
Date: Wed, 22 Oct 2025 17:32:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=B0=8F=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=8CMAC=E5=B5=8C=E5=85=A5ffmpeg=EF=BC=8C?=
 =?UTF-8?q?=E6=9E=B6=E6=9E=84=E5=88=86=E9=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yml |  2 +-
 CHANGELOG.md                | 16 ++++++++++++++++
 electron-builder.json5      |  1 -
 package.json                |  2 +-
 scripts/post-install.js     |  2 +-
 tsconfig.json               |  1 -
 tsconfig.node.json          |  1 -
 7 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fc0bd37..949d5a9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
+        os: [macos-latest, macos-latest-large, windows-latest, ubuntu-latest]
 
     steps:
       - name: Check out Git repository
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 499cb51..a83f187 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,22 @@
 # Changelog
+All significant changes to this project will be recorded in this file.
 此项目的所有显著更改都将记录在此文件中。
 
+## [v1.1.2] - 2025-10-22
+### Added
+- Add MAC embedding FFmpeg support
+### Fixed
+- Resolve the error of not setting BGM folder
+- Remove the restriction that the total duration of video materials should not be shorter than that of voice
+- Optimize some details
+### 添加
+- 增加MAC嵌入FFmpeg支持
+### 修复
+- 解决不设置bgm文件夹报错
+- 移除视频素材总时长不的短于语音的限制
+- 优化一些细节
+
+
 ## [v1.1.1] - 2025-08-26
 ### Fixed
 - Fix MAC copy and paste shortcut key failure issue
diff --git a/electron-builder.json5 b/electron-builder.json5
index 569b993..1b0d006 100644
--- a/electron-builder.json5
+++ b/electron-builder.json5
@@ -14,7 +14,6 @@
     target: [
       {
         target: 'dmg',
-        arch: ['arm64', 'x64'],
       },
     ],
     artifactName: '${name}-${version}-mac-${arch}-installer.${ext}',
diff --git a/package.json b/package.json
index 5b3d2f7..4d00316 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "short-video-factory",
   "description": "短视频工厂，一键生成产品营销与泛内容短视频，AI批量自动剪辑",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "author": {
     "name": "YILS",
     "developer": "YILS",
diff --git a/scripts/post-install.js b/scripts/post-install.js
index b92b563..b4ce697 100644
--- a/scripts/post-install.js
+++ b/scripts/post-install.js
@@ -7,7 +7,7 @@ console.log('Downloading ffmpeg...')
 execSync(
   `cross-env FFMPEG_BINARIES_URL=${process.env['npm_config_ffmpeg_binaries_url']} npm rebuild ffmpeg-static`,
 )
-console.log(`FFmpeg path: ${ffmpeg}`)
+console.log(`FFmpeg downloaded to path: ${ffmpeg}`)
 
 const isWindows = process.platform === 'win32'
 if (!isWindows) {
diff --git a/tsconfig.json b/tsconfig.json
index a6c7af9..c43c8a9 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -17,7 +17,6 @@
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     "noFallthroughCasesInSwitch": true,
-    "baseUrl": ".",
     "paths": {
       "@/*": ["./src/*"],
       "~/*": ["./*"]
diff --git a/tsconfig.node.json b/tsconfig.node.json
index ac85e51..79ba319 100644
--- a/tsconfig.node.json
+++ b/tsconfig.node.json
@@ -6,7 +6,6 @@
     "moduleResolution": "bundler",
     "allowSyntheticDefaultImports": true,
     "strict": true,
-    "baseUrl": ".",
     "paths": {
       "@/*": ["./src/*"],
       "~/*": ["./*"]