C++11 tidying.

3 files changed, 19 insertions, 25 deletions

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 9de63dc93..59b44ae97 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -160,41 +160,35 @@ DCPDecoder::pass ()
 		if (_mono_reader) {
 			video->emit (
 				film(),
-				shared_ptr<ImageProxy> (
-					new J2KImageProxy (
-						_mono_reader->get_frame (entry_point + frame),
-						picture_asset->size(),
-						AV_PIX_FMT_XYZ12LE,
-						_forced_reduction
-						)
+				std::make_shared<J2KImageProxy>(
+					_mono_reader->get_frame (entry_point + frame),
+					picture_asset->size(),
+					AV_PIX_FMT_XYZ12LE,
+					_forced_reduction
 					),
 				_offset + frame
 				);
 		} else {
 			video->emit (
 				film(),
-				shared_ptr<ImageProxy> (
-					new J2KImageProxy (
-						_stereo_reader->get_frame (entry_point + frame),
-						picture_asset->size(),
-						dcp::Eye::LEFT,
-						AV_PIX_FMT_XYZ12LE,
-						_forced_reduction
-						)
+				std::make_shared<J2KImageProxy>(
+					_stereo_reader->get_frame (entry_point + frame),
+					picture_asset->size(),
+					dcp::Eye::LEFT,
+					AV_PIX_FMT_XYZ12LE,
+					_forced_reduction
 					),
 				_offset + frame
 				);
 
 			video->emit (
 				film(),
-				shared_ptr<ImageProxy> (
-					new J2KImageProxy (
-						_stereo_reader->get_frame (entry_point + frame),
-						picture_asset->size(),
-						dcp::Eye::RIGHT,
-						AV_PIX_FMT_XYZ12LE,
-						_forced_reduction
-						)
+				std::make_shared<J2KImageProxy>(
+					_stereo_reader->get_frame (entry_point + frame),
+					picture_asset->size(),
+					dcp::Eye::RIGHT,
+					AV_PIX_FMT_XYZ12LE,
+					_forced_reduction
 					),
 				_offset + frame
 				);
diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index 1ce375594..61ca1ae00 100644
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -273,7 +273,7 @@ FFmpegEncoder::FileEncoderSet::get (Eyes eyes) const
 			eyes = Eyes::BOTH;
 		} else if (eyes == Eyes::RIGHT) {
 			/* ...and ignore the right eye.*/
-			return shared_ptr<FFmpegFileEncoder>();
+			return {};
 		}
 	}
 
diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index 29ee7455b..f253c73a0 100644
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -416,7 +416,7 @@ FFmpegFileEncoder::video (shared_ptr<PlayerVideo> video, DCPTime time)
 	}
 
 	for (int i = 0; i < 3; ++i) {
-		AVBufferRef* buffer = av_buffer_create(image->data()[i], image->stride()[i] * image->size().height, &buffer_free, this, 0);
+		auto buffer = av_buffer_create(image->data()[i], image->stride()[i] * image->size().height, &buffer_free, this, 0);
 		frame->buf[i] = av_buffer_ref (buffer);
 		frame->data[i] = buffer->data;
 		frame->linesize[i] = image->stride()[i];