projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Take Film pointer out of Content.
[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 c83bebcb54b63a1ec17e842f83c23841c2deb7ec..e38b80be1942085d9160891a29edff428fd3425a 100644
(file)
--- a/
src/lib/ffmpeg_image_proxy.cc
+++ b/
src/lib/ffmpeg_image_proxy.cc
@@
-110,7
+110,7
@@
FFmpegImageProxy::avio_seek (int64_t const pos, int whence)
}
pair<shared_ptr<Image>, int>
-FFmpegImageProxy::image (optional<dcp::
NoteHandler>, optional<dcp::
Size>) const
+FFmpegImageProxy::image (optional<dcp::Size>) const
{
boost::mutex::scoped_lock lm (_mutex);