projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Supporters update.
[dcpomatic.git]
/
src
/
lib
/
video_mxf_examiner.cc
diff --git
a/src/lib/video_mxf_examiner.cc
b/src/lib/video_mxf_examiner.cc
index 652dc6941d55f3b39b058dc28ad2a85d6e04c22c..7a05f33691a756499f93b7f07ca06ee0696c22b9 100644
(file)
--- a/
src/lib/video_mxf_examiner.cc
+++ b/
src/lib/video_mxf_examiner.cc
@@
-24,7
+24,7
@@
#include <dcp/mono_picture_asset.h>
#include <dcp/stereo_picture_asset.h>
#include <dcp/mono_picture_asset.h>
#include <dcp/stereo_picture_asset.h>
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
using boost::optional;
VideoMXFExaminer::VideoMXFExaminer (shared_ptr<const VideoMXFContent> content)
using boost::optional;
VideoMXFExaminer::VideoMXFExaminer (shared_ptr<const VideoMXFContent> content)
@@
-48,7
+48,7
@@
VideoMXFExaminer::video_frame_rate () const
return _asset->frame_rate().as_float ();
}
return _asset->frame_rate().as_float ();
}
-dcp::Size
+optional<dcp::Size>
VideoMXFExaminer::video_size () const
{
return _asset->size ();
VideoMXFExaminer::video_size () const
{
return _asset->size ();