From 1d40f33eba5b400ef23c67be7442b06df22abb60 Mon Sep 17 00:00:00 2001
From: James Crook <james.k.crook@gmail.com>
Date: Wed, 13 Feb 2019 08:46:03 +0000
Subject: [PATCH] Rename 64 bit ffmpeg libs.

Also change the prompting to suggest the new/expected name.
---
 src/FFmpeg.cpp | 5 +++--
 src/FFmpeg.h   | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/FFmpeg.cpp b/src/FFmpeg.cpp
index dbd62c7d1..b03e8c914 100644
--- a/src/FFmpeg.cpp
+++ b/src/FFmpeg.cpp
@@ -591,16 +591,17 @@ bool FFmpegLibs::FindLibs(wxWindow *parent)
    wxString path;
    wxString name;
 
+   // If we're looking for the lib, use the standard name, as the
+   // configured name is not found.
+   name = GetLibAVFormatName();
    wxLogMessage(wxT("Looking for FFmpeg libraries..."));
    if (!mLibAVFormatPath.IsEmpty()) {
       wxLogMessage(wxT("mLibAVFormatPath ('%s') is not empty."), mLibAVFormatPath);
       const wxFileName fn{ mLibAVFormatPath };
       path = fn.GetPath();
-      name = fn.GetFullName();
    }
    else {
       path = GetLibAVFormatPath();
-      name = GetLibAVFormatName();
       wxLogMessage(wxT("mLibAVFormatPath is empty, starting with path '%s', name '%s'."),
                   path, name);
    }
diff --git a/src/FFmpeg.h b/src/FFmpeg.h
index 77418872d..f16f44257 100644
--- a/src/FFmpeg.h
+++ b/src/FFmpeg.h
@@ -332,16 +332,22 @@ public:
 
    wxString GetLibAVFormatName()
    {
+      if (sizeof(void*) == 8)
+         return (wxT("ffmpeg.") wxT(AV_STRINGIFY(LIBAVFORMAT_VERSION_MAJOR)) wxT(".64bit.dylib"));
       return (wxT("libavformat.") wxT(AV_STRINGIFY(LIBAVFORMAT_VERSION_MAJOR)) wxT(".dylib"));
    }
 
    wxString GetLibAVCodecName()
    {
+      if (sizeof(void*) == 8)
+         return (wxT("ffmpeg_codecs.") wxT(AV_STRINGIFY(LIBAVCODEC_VERSION_MAJOR)) wxT(".64bit.dylib"));
       return (wxT("libavcodec.") wxT(AV_STRINGIFY(LIBAVCODEC_VERSION_MAJOR)) wxT(".dylib"));
    }
 
    wxString GetLibAVUtilName()
    {
+      if (sizeof(void*) == 8)
+         return (wxT("ffmpeg_utils.") wxT(AV_STRINGIFY(LIBAVUTIL_VERSION_MAJOR)) wxT(".64bit.dylib"));
       return (wxT("libavutil.") wxT(AV_STRINGIFY(LIBAVUTIL_VERSION_MAJOR)) wxT(".dylib"));
    }
 #else