diff options
| author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2021-06-26 02:48:47 -0300 |
|---|---|---|
| committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2021-06-26 03:29:31 -0300 |
| commit | 05bd50a1cf38daf744864828c39c20d064cac4e7 (patch) | |
| tree | f91a89c1da9fd1857649ac00aa5aaded39f1c2a1 /src/video_core/command_classes/vic.cpp | |
| parent | 3ab5bf64542f4fc8fac1e5f7579611cb49400ba4 (diff) | |
codec,vic: Disable warnings in ffmpeg headers
Diffstat (limited to 'src/video_core/command_classes/vic.cpp')
| -rw-r--r-- | src/video_core/command_classes/vic.cpp | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/src/video_core/command_classes/vic.cpp b/src/video_core/command_classes/vic.cpp index 0a8b82f2b..5faf8c0f1 100644 --- a/src/video_core/command_classes/vic.cpp +++ b/src/video_core/command_classes/vic.cpp @@ -3,7 +3,28 @@ // Refer to the license.txt file included. #include <array> + +extern "C" { +#if defined(__GNUC__) || defined(__clang__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wconversion" +#endif +#ifdef _MSC_VER +#pragma warning(disable : 4244) // conversion from 'type' to 'type', possible loss of data +#pragma warning(push) +#endif +#include <libswscale/swscale.h> +#if defined(__GNUC__) || defined(__clang__) +#pragma GCC diagnostic pop +#endif +#ifdef _MSC_VER +#pragma warning(pop) +#endif +} + #include "common/assert.h" +#include "common/logging/log.h" + #include "video_core/command_classes/nvdec.h" #include "video_core/command_classes/vic.h" #include "video_core/engines/maxwell_3d.h" @@ -11,10 +32,6 @@ #include "video_core/memory_manager.h" #include "video_core/textures/decoders.h" -extern "C" { -#include <libswscale/swscale.h> -} - namespace Tegra { Vic::Vic(GPU& gpu_, std::shared_ptr<Nvdec> nvdec_processor_) |