diff options
| author |  LC | 2020-11-26 16:38:34 -0500 |
|---|---|---|
| committer |  GitHub | 2020-11-26 16:38:34 -0500 |
| commit | ab315011fb964de132be5cbe5e64cf40fe3d7b17 (patch) | |
| tree | ebff3bb1aae1c9a35eead61617e6b24b026b9fa8 /src/video_core/command_classes | |
| parent | Merge pull request #4975 from comex/invalid-syncpoint-id (diff) | |
| parent | codec: Fix `pragma GCC diagnostic pop` missing corresponding push (diff) | |
| download | yuzu-ab315011fb964de132be5cbe5e64cf40fe3d7b17.tar.gz yuzu-ab315011fb964de132be5cbe5e64cf40fe3d7b17.tar.xz yuzu-ab315011fb964de132be5cbe5e64cf40fe3d7b17.zip | |
Merge pull request #5016 from comex/xx-push
codec: Fix `pragma GCC diagnostic pop` missing corresponding push
Diffstat (limited to 'src/video_core/command_classes')
| -rw-r--r-- | src/video_core/command_classes/codecs/codec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/video_core/command_classes/codecs/codec.h b/src/video_core/command_classes/codecs/codec.h index 5bbe6a332..ee5d62540 100644 --- a/src/video_core/command_classes/codecs/codec.h +++ b/src/video_core/command_classes/codecs/codec.h | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | 10 | ||
| 11 | extern "C" { | 11 | extern "C" { |
| 12 | #if defined(__GNUC__) || defined(__clang__) | 12 | #if defined(__GNUC__) || defined(__clang__) |
| 13 | #pragma GCC diagnostic push | ||
| 13 | #pragma GCC diagnostic ignored "-Wconversion" | 14 | #pragma GCC diagnostic ignored "-Wconversion" |
| 14 | #endif | 15 | #endif |
| 15 | #include <libavcodec/avcodec.h> | 16 | #include <libavcodec/avcodec.h> |