From 4e7c59daae8f8221af60c8d6f0dc41d8ee51dadd Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Mon, 12 Oct 2015 22:11:15 -0700 Subject: [PATCH] Fix minor typo. --- Core/HLE/sceAtrac.cpp | 10 +++++----- GPU/GPUCommon.cpp | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 7c86ae33bb..6861010417 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -2056,12 +2056,12 @@ struct At3HeaderMap { static const u8 at3HeaderTemplate[] ={0x52,0x49,0x46,0x46,0x3b,0xbe,0x00,0x00,0x57,0x41,0x56,0x45,0x66,0x6d,0x74,0x20,0x20,0x00,0x00,0x00,0x70,0x02,0x02,0x00,0x44,0xac,0x00,0x00,0x4d,0x20,0x00,0x00,0xc0,0x00,0x00,0x00,0x0e,0x00,0x01,0x00,0x00,0x10,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x00,0x00,0x64,0x61,0x74,0x61,0xc0,0xbd,0x00,0x00}; // These should represent all possible supported bitrates (66, 104, and 132 for stereo.) static const At3HeaderMap at3HeaderMap[] = { - { 0x00C0, 1, 0 }, // 132/2 (66) kbps mono - { 0x0098, 1, 0 }, // 105/2 (52.5) kbps mono - { 0x0180, 2, 0 }, // 132 kbps stereo - { 0x0130, 2, 0 }, // 105 kbps stereo + { 0x00C0, 1, 0 }, // 132/2 (66) kbps mono + { 0x0098, 1, 0 }, // 105/2 (52.5) kbps mono + { 0x0180, 2, 0 }, // 132 kbps stereo + { 0x0130, 2, 0 }, // 105 kbps stereo // At this size, stereo can only use joint stereo. - { 0x00C0, 2, 1 }, // 66 kbps stereo + { 0x00C0, 2, 1 }, // 66 kbps stereo }; static const u8 at3plusHeaderTemplate[] = { 0x52, 0x49, 0x46, 0x46, 0x00, 0xb5, 0xff, 0x00, 0x57, 0x41, 0x56, 0x45, 0x66, 0x6d, 0x74, 0x20, 0x34, 0x00, 0x00, 0x00, 0xfe, 0xff, 0x02, 0x00, 0x44, 0xac, 0x00, 0x00, 0xa0, 0x1f, 0x00, 0x00, 0xe8, 0x02, 0x00, 0x00, 0x22, 0x00, 0x00, 0x08, 0x03, 0x00, 0x00, 0x00, 0xbf, 0xaa, 0x23, 0xe9, 0x58, 0xcb, 0x71, 0x44, 0xa1, 0x19, 0xff, 0xfa, 0x01, 0xe4, 0xce, 0x62, 0x01, 0x00, 0x28, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x61, 0x63, 0x74, 0x08, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x08, 0x00, 0x00, 0x64, 0x61, 0x74, 0x61, 0xa8, 0xb4, 0xff, 0x00 }; diff --git a/GPU/GPUCommon.cpp b/GPU/GPUCommon.cpp index ebadae3f05..263e222d42 100644 --- a/GPU/GPUCommon.cpp +++ b/GPU/GPUCommon.cpp @@ -24,8 +24,6 @@ GPUCommon::GPUCommon() : dumpNextFrame_(false), dumpThisFrame_(false) { - DisplayList x; - // This assert failed on GCC x86 32-bit (but not MSVC 32-bit!) before adding the // "padding" field at the end. This is important for save state compatibility. // The compiler was not rounding the struct size up to an 8 byte boundary, which