|
|
@@ -245,7 +245,11 @@ fn resolve_ffmpeg_path(app: &AppHandle) -> Result<PathBuf, String> {
|
|
|
} else {
|
|
|
"ffmpeg"
|
|
|
};
|
|
|
- let p = resource_dir.join("resources").join("ffmpeg").join(file_name);
|
|
|
+ let p = resource_dir
|
|
|
+ .join("resources")
|
|
|
+ .join("ffmpeg")
|
|
|
+ .join("bin")
|
|
|
+ .join(file_name);
|
|
|
|
|
|
if !p.exists() {
|
|
|
return Err(format!(
|
|
|
@@ -350,9 +354,7 @@ fn spawn_ffmpeg(
|
|
|
eprintln!("[recording] spawning: ffmpeg{}", format_args_for_log(&cmd));
|
|
|
|
|
|
let mut child = cmd.spawn().map_err(|e| {
|
|
|
- format!(
|
|
|
- "启动 ffmpeg 失败(请确认 src-tauri/resources/ffmpeg/ 下已放置 ffmpeg.exe): {e}"
|
|
|
- )
|
|
|
+ format!("启动 ffmpeg 失败(请确认 src-tauri/resources/ffmpeg/ 下已放置 ffmpeg.exe): {e}")
|
|
|
})?;
|
|
|
|
|
|
// 接管 stderr:丢给一个 tokio 任务,按行实时 eprintln,同时往共享缓冲里写
|