summaryrefslogtreecommitdiff
path: root/test/ffmpeg_pts_offset_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-06-21 23:08:53 +0100
committerCarl Hetherington <cth@carlh.net>2016-06-21 23:08:53 +0100
commita8a0dfd1b21de6c0facf965ab119833ff6f790bf (patch)
tree88bd3a7dd6d4ae56a1efa9b7443c341550759869 /test/ffmpeg_pts_offset_test.cc
parente669b562937786bf5b771c927cc03a4074b01be8 (diff)
Revert "Use make_shared<>."
Support for this seems to vary wildly across DoM's build targets. Stuff that builds on 16.04 won't build on 14.04, for example. Seems to not be worth the hassle now. This reverts commit 5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f.
Diffstat (limited to 'test/ffmpeg_pts_offset_test.cc')
-rw-r--r--test/ffmpeg_pts_offset_test.cc7
1 files changed, 2 insertions, 5 deletions
diff --git a/test/ffmpeg_pts_offset_test.cc b/test/ffmpeg_pts_offset_test.cc
index ccc2a10f2..02ea0233d 100644
--- a/test/ffmpeg_pts_offset_test.cc
+++ b/test/ffmpeg_pts_offset_test.cc
@@ -22,27 +22,24 @@
* @brief Check the computation of _pts_offset in FFmpegDecoder.
*/
+#include <boost/test/unit_test.hpp>
#include "lib/film.h"
#include "lib/ffmpeg_decoder.h"
#include "lib/ffmpeg_content.h"
#include "lib/ffmpeg_audio_stream.h"
#include "lib/audio_content.h"
#include "test.h"
-#include <boost/test/unit_test.hpp>
-#include <boost/make_shared.hpp>
using boost::shared_ptr;
-using boost::make_shared;
BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
{
shared_ptr<Film> film = new_test_film ("ffmpeg_pts_offset_test");
- shared_ptr<FFmpegContent> content = make_shared<FFmpegContent> (film, "test/data/test.mp4");
+ shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/test.mp4"));
film->examine_and_add_content (content);
wait_for_jobs ();
content->audio.reset (new AudioContent (content.get()));
- /* Can't use make_shared here */
content->audio->add_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream));
content->_video_frame_rate = 24;