diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-09-02 23:55:48 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-09-02 23:55:48 +0100 |
| commit | 4b05c69e14f43826a59128b4b27316c9f9d9a84e (patch) | |
| tree | 3f3fbfb4d299eb4e368ed8bd1469e784028027fa | |
| parent | 3972f8e31d90059812a9a53d13a6d937074f037e (diff) | |
OS X build fix.
| -rw-r--r-- | test/ffmpeg_audio_only_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/ffmpeg_audio_only_test.cc b/test/ffmpeg_audio_only_test.cc index bbeef0b11..e3c90cba9 100644 --- a/test/ffmpeg_audio_only_test.cc +++ b/test/ffmpeg_audio_only_test.cc @@ -122,7 +122,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_only_test1) shared_ptr<dcp::SoundAssetReader> reader = asset.start_read (); for (int i = 0; i < asset.intrinsic_duration(); ++i) { shared_ptr<const dcp::SoundFrame> frame = reader->get_frame(i); - sf_count_t this_time = min (info.frames, 2000L); + sf_count_t this_time = min (info.frames, sf_count_t(2000)); sf_readf_short (ref, buffer, this_time); for (int j = 0; j < this_time; ++j) { BOOST_REQUIRE_EQUAL (frame->get(2, j) >> 8, buffer[j]); @@ -152,7 +152,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_only_test2) shared_ptr<dcp::SoundAssetReader> reader = asset.start_read (); for (int i = 0; i < asset.intrinsic_duration(); ++i) { shared_ptr<const dcp::SoundFrame> frame = reader->get_frame(i); - sf_count_t this_time = min (info.frames, 2000L); + sf_count_t this_time = min (info.frames, sf_count_t(2000)); sf_readf_int (ref, buffer, this_time); for (int j = 0; j < this_time; ++j) { int32_t s = frame->get(2, j); @@ -186,7 +186,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_only_test3) shared_ptr<dcp::SoundAssetReader> reader = asset.start_read (); for (int i = 0; i < asset.intrinsic_duration(); ++i) { shared_ptr<const dcp::SoundFrame> frame = reader->get_frame(i); - sf_count_t this_time = min (info.frames, 2000L); + sf_count_t this_time = min (info.frames, sf_count_t(2000)); sf_readf_int (ref, buffer, this_time); for (int j = 0; j < this_time; ++j) { int32_t s = frame->get(2, j); |