|
@@ -113,13 +113,9 @@ static void *ffmpeg_mux_create(obs_data_t *settings, obs_output_t *output)
|
|
|
}
|
|
|
|
|
|
#ifdef _WIN32
|
|
|
-#ifdef _WIN64
|
|
|
-#define FFMPEG_MUX "ffmpeg-mux64.exe"
|
|
|
+#define FFMPEG_MUX "obs-ffmpeg-mux.exe"
|
|
|
#else
|
|
|
-#define FFMPEG_MUX "ffmpeg-mux32.exe"
|
|
|
-#endif
|
|
|
-#else
|
|
|
-#define FFMPEG_MUX "ffmpeg-mux"
|
|
|
+#define FFMPEG_MUX "obs-ffmpeg-mux"
|
|
|
#endif
|
|
|
|
|
|
static inline bool capturing(struct ffmpeg_muxer *stream)
|
|
@@ -241,7 +237,7 @@ static void build_command_line(struct ffmpeg_muxer *stream, struct dstr *cmd,
|
|
|
num_tracks++;
|
|
|
}
|
|
|
|
|
|
- dstr_init_move_array(cmd, obs_module_file(FFMPEG_MUX));
|
|
|
+ dstr_init_move_array(cmd, os_get_executable_path_ptr(FFMPEG_MUX));
|
|
|
dstr_insert_ch(cmd, 0, '\"');
|
|
|
dstr_cat(cmd, "\" \"");
|
|
|
|