forked from mirror/openmw-tes3mp
Fixed conflict in last commit
This commit is contained in:
parent
7f26ba2ba3
commit
7a22068da6
1 changed files with 1 additions and 1 deletions
|
@ -55,7 +55,7 @@ static void checkALError(const char *where)
|
||||||
|
|
||||||
static void getALFormat(SampleSourcePtr inp, int &fmt, int &rate)
|
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);
|
inp->getInfo(&rate_, &ch, &bits);
|
||||||
rate = rate_;
|
rate = rate_;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue