summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/video_core/command_classes/codecs/codec.h8
-rw-r--r--src/video_core/command_classes/vic.cpp7
2 files changed, 0 insertions, 15 deletions
diff --git a/src/video_core/command_classes/codecs/codec.h b/src/video_core/command_classes/codecs/codec.h
index 3e135a2a6..8a2a6c360 100644
--- a/src/video_core/command_classes/codecs/codec.h
+++ b/src/video_core/command_classes/codecs/codec.h
@@ -14,18 +14,10 @@ extern "C" {
14#pragma GCC diagnostic push 14#pragma GCC diagnostic push
15#pragma GCC diagnostic ignored "-Wconversion" 15#pragma GCC diagnostic ignored "-Wconversion"
16#endif 16#endif
17#ifdef _MSC_VER
18#pragma warning(push)
19#pragma warning(disable : 4242) // conversion from 'type' to 'type', possible loss of data
20#pragma warning(disable : 4244) // conversion from 'type' to 'type', possible loss of data
21#endif
22#include <libavcodec/avcodec.h> 17#include <libavcodec/avcodec.h>
23#if defined(__GNUC__) || defined(__clang__) 18#if defined(__GNUC__) || defined(__clang__)
24#pragma GCC diagnostic pop 19#pragma GCC diagnostic pop
25#endif 20#endif
26#ifdef _MSC_VER
27#pragma warning(pop)
28#endif
29} 21}
30 22
31namespace Tegra { 23namespace Tegra {
diff --git a/src/video_core/command_classes/vic.cpp b/src/video_core/command_classes/vic.cpp
index 5faf8c0f1..ff3db0aee 100644
--- a/src/video_core/command_classes/vic.cpp
+++ b/src/video_core/command_classes/vic.cpp
@@ -9,17 +9,10 @@ extern "C" {
9#pragma GCC diagnostic push 9#pragma GCC diagnostic push
10#pragma GCC diagnostic ignored "-Wconversion" 10#pragma GCC diagnostic ignored "-Wconversion"
11#endif 11#endif
12#ifdef _MSC_VER
13#pragma warning(disable : 4244) // conversion from 'type' to 'type', possible loss of data
14#pragma warning(push)
15#endif
16#include <libswscale/swscale.h> 12#include <libswscale/swscale.h>
17#if defined(__GNUC__) || defined(__clang__) 13#if defined(__GNUC__) || defined(__clang__)
18#pragma GCC diagnostic pop 14#pragma GCC diagnostic pop
19#endif 15#endif
20#ifdef _MSC_VER
21#pragma warning(pop)
22#endif
23} 16}
24 17
25#include "common/assert.h" 18#include "common/assert.h"