Merge branch 'master' into 12bit

[dcpomatic.git] / test / ffmpeg_audio_test.cc

diff --git a/test/ffmpeg_audio_test.cc b/test/ffmpeg_audio_test.cc
index 19f71e9644573897891d4170ac2bfb7408418325..2e83d45c9101dbef0c064e3c0e26ef5446bcab85 100644 (file)
--- a/test/ffmpeg_audio_test.cc
+++ b/test/ffmpeg_audio_test.cc
@@ -27,6 +27,7 @@
 #include "lib/film.h"
 #include "lib/dcp_content_type.h"
 #include "lib/ratio.h"
+#include "lib/ffmpeg_content.h"
 #include "test.h"
 
 using std::string;
@@ -38,12 +39,13 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
        shared_ptr<Film> film = new_test_film ("ffmpeg_audio_test");
        film->set_name ("ffmpeg_audio_test");
        shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/staircase.mov"));
-       c->set_ratio (Ratio::from_id ("185"));
+       c->set_scale (VideoContentScale (Ratio::from_id ("185")));
        film->examine_and_add_content (c);
 
        wait_for_jobs ();
 
        film->set_container (Ratio::from_id ("185"));
+       film->set_audio_channels (6);
        film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
        film->make_dcp ();
        film->write_metadata ();