Merge branch 'master' into unstub-AllocObjCtx
All checks were successful
eden-license / license-header (pull_request) Successful in 29s
All checks were successful
eden-license / license-header (pull_request) Successful in 29s
This commit is contained in:
commit
7b590a1bc6
2 changed files with 7 additions and 3 deletions
|
@ -60,7 +60,7 @@ android {
|
|||
// TODO If this is ever modified, change application_id in strings.xml
|
||||
applicationId = "dev.eden.eden_emulator"
|
||||
minSdk = 30
|
||||
targetSdk = 35
|
||||
targetSdk = 36
|
||||
versionName = getGitVersion()
|
||||
|
||||
versionCode = autoVersion
|
||||
|
@ -150,7 +150,8 @@ android {
|
|||
|
||||
create("genshinSpoof") {
|
||||
dimension = "version"
|
||||
applicationId = "com.miHoYo.Yuanshen"
|
||||
resValue("string", "app_name_suffixed", "Eden Optimised")
|
||||
applicationId = "com.miHoYo.Yuanshen"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
|
@ -41,7 +44,7 @@ void Decoder::Decode() {
|
|||
|
||||
if (!frame.get()) {
|
||||
LOG_ERROR(HW_GPU,
|
||||
"Nvdec {} dailed to decode interlaced frame for top 0x{:X} bottom 0x{:X}", id,
|
||||
"Nvdec {} failed to decode interlaced frame for top 0x{:X} bottom 0x{:X}", id,
|
||||
luma_top, luma_bottom);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue