Mercurial > hg > svcore
diff base/test/TestRealTime.h @ 1069:32ab6c48efaa
Merge from branch tonioni
author | Chris Cannam |
---|---|
date | Mon, 20 Apr 2015 09:11:34 +0100 |
parents | a1cd5abcb38b |
children | b8a788c9a6f1 |
line wrap: on
line diff
--- a/base/test/TestRealTime.h Mon Mar 02 17:21:34 2015 +0000 +++ b/base/test/TestRealTime.h Mon Apr 20 09:11:34 2015 +0100 @@ -282,12 +282,12 @@ int m = sizeof(rates)/sizeof(rates[0]); for (int i = 0; i < n; ++i) { - int frame = frames[i]; + sv_frame_t frame = frames[i]; for (int j = 0; j < m; ++j) { int rate = rates[j]; RealTime rt = RealTime::frame2RealTime(frame, rate); - int conv = RealTime::realTime2Frame(rt, rate); + sv_frame_t conv = RealTime::realTime2Frame(rt, rate); QCOMPARE(frame, conv); rt = RealTime::frame2RealTime(-frame, rate);