From 1f6dcc9de8f751610449baacab63bf4b7a8ecf89 Mon Sep 17 00:00:00 2001
From: Dave Rice <dave@dericed.com>
Date: Tue, 7 Jan 2025 10:40:18 -0500
Subject: [PATCH] prefer to use a gui-bundled ffmpeg

---
 tools/dvpackager | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tools/dvpackager b/tools/dvpackager
index cf8b0209..812e5d68 100755
--- a/tools/dvpackager
+++ b/tools/dvpackager
@@ -668,10 +668,17 @@ _report(){
 }
 
 _get_ffmpeg_path(){
-if [[ -x '/usr/lib/dvrescue/bin/ffmpeg' ]] ; then
+if [[ -x '/Applications/dvrescue.app/Contents/Helpers/ffmpeg' ]] ; then
+    FFMPEG_PATH='/Applications/dvrescue.app/Contents/Helpers/ffmpeg'
+elif [[ -x '/usr/lib64/dvrescue/bin/ffmpeg' ]] ; then
+    FFMPEG_PATH='/usr/lib64/dvrescue/bin/ffmpeg'
+elif [[ -x '/usr/lib/dvrescue/bin/ffmpeg' ]] ; then
     FFMPEG_PATH='/usr/lib/dvrescue/bin/ffmpeg'
+elif [[ -x '/cygdrive/c/Program Files/dvrescue/ffmpeg.exe' ]] ; then
+    FFMPEG_PATH='/cygdrive/c/Program Files/dvrescue/ffmpeg.exe'
 else
     FFMPEG_PATH="$(which ffmpeg)"
+    _report "dvpackager would prefer to use an ffmpeg bundled with the DVRescue GUI, but can't find one. We'll use ${FFMPEG_PATH} for now, but suggest installing/updating the DVRescue GUI."
 fi
 if [[ ! -x "${FFMPEG_PATH}" ]] ; then
     _report "ffmpeg can't be found, please install of rerun by ffmpeg's path specified with -F"