From 3b31d2d8a129ae6d8d267427bd6b5bc444b40b2a Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 14 Apr 2020 21:38:26 +0200
Subject: Use a struct rather than a std::pair as the return type from
 ImageProxy::image.

---
 src/lib/ffmpeg_image_proxy.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/lib/ffmpeg_image_proxy.cc')

diff --git a/src/lib/ffmpeg_image_proxy.cc b/src/lib/ffmpeg_image_proxy.cc
index 9c91d1d87..87fb154d0 100644
--- a/src/lib/ffmpeg_image_proxy.cc
+++ b/src/lib/ffmpeg_image_proxy.cc
@@ -112,13 +112,14 @@ FFmpegImageProxy::avio_seek (int64_t const pos, int whence)
 	return _pos;
 }
 
-pair<shared_ptr<Image>, int>
+
+ImageProxy::Result
 FFmpegImageProxy::image (optional<dcp::Size>) const
 {
 	boost::mutex::scoped_lock lm (_mutex);
 
 	if (_image) {
-		return make_pair (_image, 0);
+		return Result (_image, 0);
 	}
 
 	uint8_t* avio_buffer = static_cast<uint8_t*> (wrapped_av_malloc(4096));
@@ -192,7 +193,7 @@ FFmpegImageProxy::image (optional<dcp::Size>) const
 	av_free (avio_context->buffer);
 	av_free (avio_context);
 
-	return make_pair (_image, 0);
+	return Result (_image, 0);
 }
 
 void
-- 
cgit v1.2.3