Fix a few warnings.

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 785a805f4f5b2aba6c41615dae79d8616df678ea..d8ee278b39a3756d5bdb146638286d397a0ed3b0 100644 (file)
--- 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 cbb84a94019bc0a97fc67abf14e05545ccaf4675..6601fb2fe69631ebbc2228f2ad7d1d51987bec11 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -89,7 +89,7 @@ Writer::Writer (shared_ptr<const Film> f, shared_ptr<Job> 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 7ea031e27c089bc3a03a8de71a34de0882075194..1e3bf1d545b534b35d61ee5c47e6fdceccdd9f51 100644 (file)
--- 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 dba611043793d1c53713929bd008133ec35346bd..ab64928ce8a656e0dfb7befbacf3eedb5522678a 100644 (file)
--- a/test/scaling_test.cc
+++ b/test/scaling_test.cc
@@ -31,7 +31,7 @@ static void scaling_test_for (shared_ptr<Film> film, shared_ptr<VideoContent> 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<ImageMagickContent> 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);