diff options
| author |  Mai M | 2022-01-20 13:56:32 -0500 |
|---|---|---|
| committer |  GitHub | 2022-01-20 13:56:32 -0500 |
| commit | 55ef89a9c70d8f817d8eae9a438f1d85aa31397f (patch) | |
| tree | 69c38fef90a7e1d8921eda560e60842c2e6c6d4f /src | |
| parent | Merge pull request #7726 from german77/clamp (diff) | |
| parent | video_core: constify AVCodec for ffmpeg >= 5.0 (diff) | |
| download | yuzu-55ef89a9c70d8f817d8eae9a438f1d85aa31397f.tar.gz yuzu-55ef89a9c70d8f817d8eae9a438f1d85aa31397f.tar.xz yuzu-55ef89a9c70d8f817d8eae9a438f1d85aa31397f.zip | |
Merge pull request #7749 from jbeich/ffmpeg5
video_core: unbreak build with FFmpeg 5.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/command_classes/codecs/codec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/command_classes/codecs/codec.h b/src/video_core/command_classes/codecs/codec.h index 13ed88382..de5672155 100644 --- a/src/video_core/command_classes/codecs/codec.h +++ b/src/video_core/command_classes/codecs/codec.h | |||
| @@ -66,7 +66,7 @@ private: | |||
| 66 | bool initialized{}; | 66 | bool initialized{}; |
| 67 | NvdecCommon::VideoCodec current_codec{NvdecCommon::VideoCodec::None}; | 67 | NvdecCommon::VideoCodec current_codec{NvdecCommon::VideoCodec::None}; |
| 68 | 68 | ||
| 69 | AVCodec* av_codec{nullptr}; | 69 | const AVCodec* av_codec{nullptr}; |
| 70 | AVCodecContext* av_codec_ctx{nullptr}; | 70 | AVCodecContext* av_codec_ctx{nullptr}; |
| 71 | AVBufferRef* av_gpu_decoder{nullptr}; | 71 | AVBufferRef* av_gpu_decoder{nullptr}; |
| 72 | 72 | ||