diff options
| author | bunnei <bunneidev@gmail.com> | 2017-10-09 23:56:20 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2017-10-09 23:56:20 -0400 |
| commit | b1d5db1cf60344b6b081c9d03cb6ccc3264326cd (patch) | |
| tree | fde377c4ba3c0f92c032e6f5ec8627aae37270ef /src/audio_core/codec.h | |
| parent | 23ce4f5afc66eb04a7aafc4f89685b8109b8d5c6 (diff) | |
| parent | d15e15bd058f93f1600c86ad8de7482740724f3f (diff) | |
Merge remote-tracking branch 'upstream/master' into nx
# Conflicts:
# src/core/CMakeLists.txt
# src/core/arm/dynarmic/arm_dynarmic.cpp
# src/core/arm/dyncom/arm_dyncom.cpp
# src/core/hle/kernel/process.cpp
# src/core/hle/kernel/thread.cpp
# src/core/hle/kernel/thread.h
# src/core/hle/kernel/vm_manager.cpp
# src/core/loader/3dsx.cpp
# src/core/loader/elf.cpp
# src/core/loader/ncch.cpp
# src/core/memory.cpp
# src/core/memory.h
# src/core/memory_setup.h
Diffstat (limited to 'src/audio_core/codec.h')
| -rw-r--r-- | src/audio_core/codec.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/audio_core/codec.h b/src/audio_core/codec.h index 2b0c395e6..877b2202d 100644 --- a/src/audio_core/codec.h +++ b/src/audio_core/codec.h @@ -5,13 +5,13 @@ #pragma once #include <array> -#include <vector> +#include <deque> #include "common/common_types.h" namespace Codec { /// A variable length buffer of signed PCM16 stereo samples. -using StereoBuffer16 = std::vector<std::array<s16, 2>>; +using StereoBuffer16 = std::deque<std::array<s16, 2>>; /// See: Codec::DecodeADPCM struct ADPCMState { |