diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-04-14 21:38:26 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-04-14 21:38:26 +0200 |
| commit | 3b31d2d8a129ae6d8d267427bd6b5bc444b40b2a (patch) | |
| tree | 780947aefb2249a2614bf9e3d894b5256f015967 /src/lib/ffmpeg_image_proxy.cc | |
| parent | b029cb06c4e0fca1fad9fecd78939efe5532fa9a (diff) | |
Use a struct rather than a std::pair as the return type from ImageProxy::image.
Diffstat (limited to 'src/lib/ffmpeg_image_proxy.cc')
| -rw-r--r-- | src/lib/ffmpeg_image_proxy.cc | 7 |
1 files changed, 4 insertions, 3 deletions
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 |