From a30100943a7a750a0c26fbcfc841b6ade4ac36c4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 10 Jul 2013 12:26:21 +0100 Subject: [PATCH] Fix a few warnings. --- src/lib/ffmpeg_decoder.cc | 2 +- src/lib/writer.cc | 2 +- test/black_fill_test.cc | 4 ++-- test/scaling_test.cc | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 785a805f4..d8ee278b3 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -122,7 +122,7 @@ FFmpegDecoder::pass () /* XXX: should we reset _packet.data and size after each *_decode_* call? */ if (_decode_video) { - while (decode_video_packet ()); + while (decode_video_packet ()) {} } if (_ffmpeg_content->audio_stream() && _decode_audio) { diff --git a/src/lib/writer.cc b/src/lib/writer.cc index cbb84a940..6601fb2fe 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -89,7 +89,7 @@ Writer::Writer (shared_ptr f, shared_ptr j) _film->dcp_audio_mxf_filename (), _film->dcp_video_frame_rate (), _film->dcp_audio_channels (), - _film->dcp_audio_frame_rate() + _film->dcp_audio_frame_rate () ) ); diff --git a/test/black_fill_test.cc b/test/black_fill_test.cc index 7ea031e27..1e3bf1d54 100644 --- a/test/black_fill_test.cc +++ b/test/black_fill_test.cc @@ -39,7 +39,7 @@ BOOST_AUTO_TEST_CASE (black_fill_test) film->examine_and_add_content (contentA); film->examine_and_add_content (contentB); - while (JobManager::instance()->work_to_do ()); + while (JobManager::instance()->work_to_do ()) {} contentA->set_video_length (3); contentA->set_start (film->video_frames_to_time (2)); @@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE (black_fill_test) film->make_dcp (); - while (JobManager::instance()->work_to_do ()); + while (JobManager::instance()->work_to_do ()) {} BOOST_CHECK (!JobManager::instance()->errors()); diff --git a/test/scaling_test.cc b/test/scaling_test.cc index dba611043..ab64928ce 100644 --- a/test/scaling_test.cc +++ b/test/scaling_test.cc @@ -31,7 +31,7 @@ static void scaling_test_for (shared_ptr film, shared_ptr co film->set_container (Ratio::from_id (container)); film->make_dcp (); - while (JobManager::instance()->work_to_do ()); + while (JobManager::instance()->work_to_do ()) {} BOOST_CHECK (!JobManager::instance()->errors()); @@ -57,7 +57,7 @@ BOOST_AUTO_TEST_CASE (scaling_test) shared_ptr imc (new ImageMagickContent (film, "test/data/simple_testcard_640x480.png")); film->examine_and_add_content (imc); - while (JobManager::instance()->work_to_do ()); + while (JobManager::instance()->work_to_do ()) {} imc->set_video_length (1); -- 2.30.2