From 161acb3d7d5d95284f10f05287465c268bc692f3 Mon Sep 17 00:00:00 2001 From: eisneinechse <42617957+eisneinechse@users.noreply.github.com> Date: Tue, 18 Sep 2018 12:38:53 -0700 Subject: [PATCH] Include messages in the compile display to make sure the right ffmpeg version is used (>= 3.2) to get hardware acceleration --- src/FFmpegReader.cpp | 6 ++++++ src/FFmpegWriter.cpp | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/FFmpegReader.cpp b/src/FFmpegReader.cpp index 7dbb21d9..76c0ddd0 100644 --- a/src/FFmpegReader.cpp +++ b/src/FFmpegReader.cpp @@ -32,6 +32,12 @@ #define PRAYFORAWONDER 0 +#if IS_FFMPEG_3_2 +#pragma message "You are compiling with experimental hardware decode" +#else +#pragma message "You are compiling only with software decode" +#endif + #if IS_FFMPEG_3_2 #define MAX_SUPPORTED_WIDTH 1950 #define MAX_SUPPORTED_HEIGHT 1100 diff --git a/src/FFmpegWriter.cpp b/src/FFmpegWriter.cpp index b1d98a80..0b978d8a 100644 --- a/src/FFmpegWriter.cpp +++ b/src/FFmpegWriter.cpp @@ -32,6 +32,12 @@ using namespace openshot; +#if IS_FFMPEG_3_2 +#pragma message "You are compiling with experimental hardware encode" +#else +#pragma message "You are compiling only with software encode" +#endif + #if IS_FFMPEG_3_2 int hw_en_on = 1; // Is set in UI int hw_en_supported = 0; // Is set by FFmpegWriter