commit 58032905a04431bf6ce321a71cde0f0c5c3d7b5a Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Fri Mar 3 21:36:18 2017 +0000 remove obs patch from gitignore and readd it properly .gitignore | 10 +--------- obs-ffmpeg-mux.patch | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) --- diff --git a/.gitignore b/.gitignore index 49cf4f6..aa7d1d6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1 @@ -/obs-studio-0.15.4.tar.gz -/obs-studio-0.16.2.tar.gz -/obs-studio-4505d5ac33b6c5d4bb828dd62b027452a6ac262d.tar.gz -/obs-studio-0.16.5.tar.gz -/obs-studio-0.16.6.tar.gz -/obs-studio-17.0.0.tar.gz -/obs-studio-17.0.2.tar.gz -/obs-ffmpeg-mux.patch -/obs-studio-18.0.0.tar.gz +/obs-studio-*.tar.gz diff --git a/obs-ffmpeg-mux.patch b/obs-ffmpeg-mux.patch new file mode 100644 index 0000000..d7be21b --- /dev/null +++ b/obs-ffmpeg-mux.patch @@ -0,0 +1,25 @@ +--- plugins/obs-ffmpeg/obs-ffmpeg-mux.c ++++ plugins/obs-ffmpeg/obs-ffmpeg-mux.c +@@ -235,8 +235,11 @@ + aencoders[num_tracks] = aencoder; + num_tracks++; + } +- ++#ifdef FFMPEG_MUX_FIXED ++ dstr_init_copy(cmd, FFMPEG_MUX_FIXED); ++#else + dstr_init_move_array(cmd, obs_module_file(FFMPEG_MUX)); ++#endif + dstr_insert_ch(cmd, 0, '\"'); + dstr_cat(cmd, "\" \""); + +--- CMakeLists.txt 2017-01-18 19:55:31.000000000 +0100 ++++ CMakeLists.txt 2017-01-30 20:46:26.382264509 +0100 +@@ -24,6 +24,7 @@ + include(ObsHelpers) + include(ObsCpack) + include(GNUInstallDirs) ++add_definitions(-DFFMPEG_MUX_FIXED=\"/usr/libexec/obs-plugins/obs-ffmpeg/ffmpeg-mux\") + + if(MSVC AND NOT EXISTS "${CMAKE_BINARY_DIR}/ALL_BUILD.vcxproj.user") + file(GENERATE