summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-05-13 14:43:27 +0100
committerCarl Hetherington <cth@carlh.net>2016-05-18 11:50:29 +0100
commit29fe2d3a4c347e15b987f9e61e56d22a21d4678f (patch)
tree910b7afc8a109733edd76befc0d17e9be902fb1b /test
parent640a1ef73e575fe891a420dec392dace8b1a0255 (diff)
Remove unnecessary Film variable in ContentPart.
Diffstat (limited to 'test')
-rw-r--r--test/audio_decoder_test.cc2
m---------test/data0
-rw-r--r--test/ffmpeg_pts_offset_test.cc2
3 files changed, 2 insertions, 2 deletions
diff --git a/test/audio_decoder_test.cc b/test/audio_decoder_test.cc
index 7dba67b5a..45617bc41 100644
--- a/test/audio_decoder_test.cc
+++ b/test/audio_decoder_test.cc
@@ -41,7 +41,7 @@ public:
TestAudioContent (shared_ptr<const Film> film)
: Content (film)
{
- audio.reset (new AudioContent (this, film));
+ audio.reset (new AudioContent (this));
audio->set_stream (AudioStreamPtr (new AudioStream (48000, audio_length(), 2)));
}
diff --git a/test/data b/test/data
-Subproject f70fddede90fdb87ff8ee2339f208d2658c665a
+Subproject caafd158432719c233e4a6c255f32b78c1c545a
diff --git a/test/ffmpeg_pts_offset_test.cc b/test/ffmpeg_pts_offset_test.cc
index a10e505dd..141569217 100644
--- a/test/ffmpeg_pts_offset_test.cc
+++ b/test/ffmpeg_pts_offset_test.cc
@@ -38,7 +38,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
film->examine_and_add_content (content);
wait_for_jobs ();
- content->audio.reset (new AudioContent (content.get(), film));
+ content->audio.reset (new AudioContent (content.get()));
content->audio->add_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream));
content->_video_frame_rate = 24;