summaryrefslogtreecommitdiff
path: root/test/ffmpeg_decoder_sequential_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-06-21 01:14:06 +0100
committerCarl Hetherington <cth@carlh.net>2016-06-21 01:14:06 +0100
commit5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f (patch)
tree769dca1358e35017ce5a5b3ab2dfafe2b24d61ed /test/ffmpeg_decoder_sequential_test.cc
parent4e83acad0c2a5c528709a175a80261b8147d3b49 (diff)
Use make_shared<>.
Diffstat (limited to 'test/ffmpeg_decoder_sequential_test.cc')
-rw-r--r--test/ffmpeg_decoder_sequential_test.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index 6a27d698f..9edca0160 100644
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -31,6 +31,7 @@
#include "lib/film.h"
#include "test.h"
#include <boost/filesystem.hpp>
+#include <boost/make_shared.hpp>
#include <boost/test/unit_test.hpp>
#include <iostream>
@@ -38,6 +39,7 @@ using std::cout;
using std::cerr;
using std::list;
using boost::shared_ptr;
+using boost::make_shared;
using boost::optional;
void
@@ -50,11 +52,11 @@ ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int
}
shared_ptr<Film> film = new_test_film ("ffmpeg_decoder_seek_test_" + file.string());
- shared_ptr<FFmpegContent> content (new FFmpegContent (film, path));
+ shared_ptr<FFmpegContent> content = make_shared<FFmpegContent> (film, path);
film->examine_and_add_content (content);
wait_for_jobs ();
- shared_ptr<Log> log (new NullLog);
- shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (content, log, false));
+ shared_ptr<Log> log = make_shared<NullLog> ();
+ shared_ptr<FFmpegDecoder> decoder = make_shared<FFmpegDecoder> (content, log, false);
BOOST_REQUIRE (decoder->video->_content->video_frame_rate());
BOOST_CHECK_CLOSE (decoder->video->_content->video_frame_rate().get(), fps, 0.01);