Fixup: Merge conflict with dsp lle

2018-12-15 15:06:54 +01:00
parent c521f3b7d6
commit 45b5de7a18
2 changed files with 11 additions and 11 deletions
--- 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;
    }