Merge branch 'beta' of github.com:ggarra13/mrv2 into beta

ggarra13 · Oct 22, 2023 · 708a546 · 708a546
2 parents 876c6a7 + 09efcb9
commit 708a546
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/mrv2/docs/HISTORY.md b/mrv2/docs/HISTORY.md
@@ -33,6 +33,8 @@ v0.8.2
 - The metadata for sessions has changed API.  Now it is a Python dict.
 - Added libvpx on Linux and macOS which was missing.
 - Added support for decoding webm (vpx) videos with alpha channel.
+- Fixed crashing issues on macOS at start up due to brew libraries being
+  loaded instead of the mrv2 shipped libraries.
 
 
 v0.8.1

diff --git a/mrv2/etc/macOS/startup.sh b/mrv2/etc/macOS/startup.sh
@@ -26,6 +26,7 @@ dynlib="$rsrc/lib"
 # echo "rsrc=$rsrc"
 # echo "dynlib=$dynlib"
 
+export DYLD_LIBRARY_PATH="$dynlib:${DYLD_LIBRARY_PATH}"
 export DYLD_FALLBACK_LIBRARY_PATH=$dynlib
 export DYLD_FRAMEWORK_PATH=$dynlib
 exec "$rsrc/bin/mrv2" $*