projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace aligned bool with enum Alignment.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_image_proxy.cc
diff --git
a/src/lib/ffmpeg_image_proxy.cc
b/src/lib/ffmpeg_image_proxy.cc
index e7d5b424dc0da3bdb052eab77f14c90f3fd0716b..4b3c3084c7f2db4a71c529f88b23f8b7c1e1e7f6 100644
(file)
--- a/
src/lib/ffmpeg_image_proxy.cc
+++ b/
src/lib/ffmpeg_image_proxy.cc
@@
-122,7
+122,7
@@
FFmpegImageProxy::avio_seek (int64_t const pos, int whence)
ImageProxy::Result
ImageProxy::Result
-FFmpegImageProxy::image (optional<dcp::Size>) const
+FFmpegImageProxy::image (
Image::Alignment alignment,
optional<dcp::Size>) const
{
auto constexpr name_for_errors = "FFmpegImageProxy::image";
{
auto constexpr name_for_errors = "FFmpegImageProxy::image";
@@
-205,7
+205,7
@@
FFmpegImageProxy::image (optional<dcp::Size>) const
throw DecodeError (N_("avcodec_receive_frame"), name_for_errors, r, *_path);
}
throw DecodeError (N_("avcodec_receive_frame"), name_for_errors, r, *_path);
}
- _image = make_shared<Image>(frame);
+ _image = make_shared<Image>(frame
, alignment
);
av_packet_unref (&packet);
av_frame_free (&frame);
av_packet_unref (&packet);
av_frame_free (&frame);