Fixed conflict in last commit

This commit is contained in:
Nicolay Korslund 2010-09-10 13:57:35 +02:00
parent 7f26ba2ba3
commit 7a22068da6

View file

@ -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_;