From a8a0dfd1b21de6c0facf965ab119833ff6f790bf Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 21 Jun 2016 23:08:53 +0100 Subject: 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. --- src/lib/ffmpeg_decoder.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/lib/ffmpeg_decoder.cc') diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 69ed7ac12..df6b7416b 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -50,7 +50,6 @@ extern "C" { } #include #include -#include #include #include #include @@ -72,7 +71,6 @@ using std::pair; using std::max; using std::map; using boost::shared_ptr; -using boost::make_shared; using boost::is_any_of; using boost::split; using dcp::Size; @@ -177,7 +175,7 @@ FFmpegDecoder::deinterleave_audio (shared_ptr stream) const */ int const total_samples = size / bytes_per_audio_sample (stream); int const frames = total_samples / stream->channels(); - shared_ptr audio = make_shared (stream->channels(), frames); + shared_ptr audio (new AudioBuffers (stream->channels(), frames)); switch (audio_sample_format (stream)) { case AV_SAMPLE_FMT_U8: @@ -454,7 +452,7 @@ FFmpegDecoder::decode_video_packet () if (i->second != AV_NOPTS_VALUE) { double const pts = i->second * av_q2d (_format_context->streams[_video_stream.get()]->time_base) + _pts_offset.seconds (); video->give ( - make_shared (image), + shared_ptr (new RawImageProxy (image)), llrint (pts * _ffmpeg_content->active_video_frame_rate ()) ); } else { @@ -534,7 +532,7 @@ FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimeP /* Note RGBA is expressed little-endian, so the first byte in the word is R, second G, third B, fourth A. */ - shared_ptr image = make_shared (AV_PIX_FMT_RGBA, dcp::Size (rect->w, rect->h), true); + shared_ptr image (new Image (AV_PIX_FMT_RGBA, dcp::Size (rect->w, rect->h), true)); #ifdef DCPOMATIC_HAVE_AVSUBTITLERECT_PICT /* Start of the first line in the subtitle */ -- cgit v1.2.3