From 45b5de7a182385682ac581531355d602d2dcdec4 Mon Sep 17 00:00:00 2001
From: B3N30 <benediktthomas@gmail.com>
Date: Sat, 15 Dec 2018 15:06:54 +0100
Subject: [PATCH] Fixup: Merge conflict with dsp lle

---
 src/audio_core/CMakeLists.txt  | 18 +++++++++---------
 src/audio_core/hle/ffmpeg_dl.h |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/audio_core/CMakeLists.txt b/src/audio_core/CMakeLists.txt
index 0fcb87859..a0edc355d 100644
--- a/src/audio_core/CMakeLists.txt
+++ b/src/audio_core/CMakeLists.txt
@@ -37,6 +37,15 @@ create_target_directory_groups(audio_core)
 target_link_libraries(audio_core PUBLIC common core)
 target_link_libraries(audio_core PRIVATE SoundTouch teakra)
 
+if(FFMPEG_FOUND)
+    if(UNIX)
+        target_link_libraries(audio_core PRIVATE FFmpeg::avcodec)
+    else()
+        target_include_directories(audio_core PRIVATE ${FFMPEG_DIR}/include)
+    endif()
+    target_compile_definitions(audio_core PRIVATE HAVE_FFMPEG)
+endif()
+
 if(SDL2_FOUND)
     target_link_libraries(audio_core PRIVATE SDL2)
     target_compile_definitions(audio_core PRIVATE HAVE_SDL2)
@@ -47,12 +56,3 @@ if(ENABLE_CUBEB)
     add_definitions(-DHAVE_CUBEB=1)
 endif()
 
-if(FFMPEG_FOUND)
-    if(UNIX)
-        target_link_libraries(audio_core PRIVATE FFmpeg::avcodec)
-    else()
-        target_include_directories(audio_core PRIVATE  ${FFMPEG_DIR}/include)
-    endif()
-    target_compile_definitions(audio_core PRIVATE HAVE_FFMPEG)
-endif()
-
diff --git a/src/audio_core/hle/ffmpeg_dl.h b/src/audio_core/hle/ffmpeg_dl.h
index 26aad1d96..df787f160 100644
--- a/src/audio_core/hle/ffmpeg_dl.h
+++ b/src/audio_core/hle/ffmpeg_dl.h
@@ -6,7 +6,7 @@
 
 #ifdef _WIN32
 #include <windows.h>
-#endif
+#endif  // _WIN32
 
 #include "common/logging/log.h"
 
@@ -71,7 +71,7 @@ bool InitFFmpegDL() {
 
         // Free the buffer.
         LocalFree(messageBuffer);
-        LOG_ERROR(Audio_DSP, "Could not load avcodec-58.dll: {}", message);
+        LOG_ERROR(Audio_DSP, "Could not load avutil-56.dll: {}", message);
         return false;
     }