diff options
| author | Ameer J <52414509+ameerj@users.noreply.github.com> | 2021-10-09 15:51:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-09 15:51:05 -0400 |
| commit | 4fbec776d6982e8ad52064eb9dbe407a94a84cdd (patch) | |
| tree | ce51ce11125fd81b08fa8207e4546ea93cfec98d /src | |
| parent | 39cd6306e63848cdb9fafa6d30311b372223d3d4 (diff) | |
| parent | 0394e4bb8ee35981ad1a39818e21ba23faf80db6 (diff) | |
Merge pull request #7152 from v1993/patch-6
vic: Allow surface to be higher than frame
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/command_classes/vic.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/video_core/command_classes/vic.cpp b/src/video_core/command_classes/vic.cpp index 51f739801..dc768b952 100644 --- a/src/video_core/command_classes/vic.cpp +++ b/src/video_core/command_classes/vic.cpp @@ -88,9 +88,10 @@ void Vic::Execute() { const u64 surface_width = config.surface_width_minus1 + 1; const u64 surface_height = config.surface_height_minus1 + 1; if (static_cast<u64>(frame->width) != surface_width || - static_cast<u64>(frame->height) != surface_height) { + static_cast<u64>(frame->height) > surface_height) { // TODO: Properly support multiple video streams with differing frame dimensions - LOG_WARNING(Debug, "Frame dimensions {}x{} do not match expected surface dimensions {}x{}", + LOG_WARNING(Debug, + "Frame dimensions {}x{} can't be safely decoded into surface dimensions {}x{}", frame->width, frame->height, surface_width, surface_height); return; } |