diff options
| author | 2021-12-15 00:03:20 -0800 | |
|---|---|---|
| committer | 2021-12-15 00:03:20 -0800 | |
| commit | 2a24c415c18bd7793b1d9986bfffc1cd7cf2c2e8 (patch) | |
| tree | 486a47945aa83e2842f54dce2e9f153d396a1886 /src/video_core/command_classes | |
| parent | Merge pull request #7565 from liushuyu/fix-linux-decoding (diff) | |
| parent | Revert "video_core/codecs: refactor ffmpeg searching and handling in cmake" (diff) | |
| download | yuzu-2a24c415c18bd7793b1d9986bfffc1cd7cf2c2e8.tar.gz yuzu-2a24c415c18bd7793b1d9986bfffc1cd7cf2c2e8.tar.xz yuzu-2a24c415c18bd7793b1d9986bfffc1cd7cf2c2e8.zip | |
Merge pull request #7589 from yuzu-emu/revert-7565-fix-linux-decoding
Revert "video_core/codecs: refactor ffmpeg searching and handling in cmake"
Diffstat (limited to 'src/video_core/command_classes')
| -rw-r--r-- | src/video_core/command_classes/codecs/codec.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/video_core/command_classes/codecs/codec.cpp b/src/video_core/command_classes/codecs/codec.cpp index 868b82f9b..2a532b883 100644 --- a/src/video_core/command_classes/codecs/codec.cpp +++ b/src/video_core/command_classes/codecs/codec.cpp | |||
| @@ -130,12 +130,6 @@ bool Codec::CreateGpuAvDevice() { | |||
| 130 | } | 130 | } |
| 131 | if (config->methods & HW_CONFIG_METHOD && config->device_type == type) { | 131 | if (config->methods & HW_CONFIG_METHOD && config->device_type == type) { |
| 132 | av_codec_ctx->pix_fmt = config->pix_fmt; | 132 | av_codec_ctx->pix_fmt = config->pix_fmt; |
| 133 | if (config->methods & AV_CODEC_HW_CONFIG_METHOD_HW_FRAMES_CTX) { | ||
| 134 | // skip zero-copy decoders, we don't currently support them | ||
| 135 | LOG_DEBUG(Service_NVDRV, "Skipping decoder {} with unsupported capability {}.", | ||
| 136 | av_hwdevice_get_type_name(type), config->methods); | ||
| 137 | continue; | ||
| 138 | } | ||
| 139 | LOG_INFO(Service_NVDRV, "Using {} GPU decoder", av_hwdevice_get_type_name(type)); | 133 | LOG_INFO(Service_NVDRV, "Using {} GPU decoder", av_hwdevice_get_type_name(type)); |
| 140 | return true; | 134 | return true; |
| 141 | } | 135 | } |