diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-06-27 09:33:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-27 09:33:58 -0400 |
| commit | 4df04ad48a2b9f04712ad6627e9712f3625253a9 (patch) | |
| tree | f66c02d4380eaf2ce4391741edb6dda5d6b0dcde /src/video_core/command_classes/codecs/codec.h | |
| parent | 3bc7b0a587b39671797d5581ea9d252d197c4f5a (diff) | |
| parent | 9476309d53b194d6ded5469dda8c3f0808e712ce (diff) | |
Merge pull request #6529 from ReinUsesLisp/reaper-fixups
buffer_cache,texture_cache: Misc fixups from the memory reaper
Diffstat (limited to 'src/video_core/command_classes/codecs/codec.h')
| -rw-r--r-- | src/video_core/command_classes/codecs/codec.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/video_core/command_classes/codecs/codec.h b/src/video_core/command_classes/codecs/codec.h index 8a2a6c360..3e135a2a6 100644 --- a/src/video_core/command_classes/codecs/codec.h +++ b/src/video_core/command_classes/codecs/codec.h @@ -14,10 +14,18 @@ extern "C" { #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wconversion" #endif +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable : 4242) // conversion from 'type' to 'type', possible loss of data +#pragma warning(disable : 4244) // conversion from 'type' to 'type', possible loss of data +#endif #include <libavcodec/avcodec.h> #if defined(__GNUC__) || defined(__clang__) #pragma GCC diagnostic pop #endif +#ifdef _MSC_VER +#pragma warning(pop) +#endif } namespace Tegra { |