mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-29 22:20:33 +00:00
Fixed conflict in last commit
This commit is contained in:
parent
7f26ba2ba3
commit
7a22068da6
@ -55,7 +55,7 @@ static void checkALError(const char *where)
|
||||
|
||||
static void getALFormat(SampleSourcePtr inp, int &fmt, int &rate)
|
||||
{
|
||||
int32_t rate_, ch, bits;
|
||||
boost::int32_t rate_, ch, bits;
|
||||
inp->getInfo(&rate_, &ch, &bits);
|
||||
rate = rate_;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user