projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master; specify libdcp-1.0.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_examiner.h
diff --git
a/src/lib/ffmpeg_examiner.h
b/src/lib/ffmpeg_examiner.h
index 369dac29c992748b3b394b1a42ae1da3a4315235..81275a9e1733c4223f9a94610b1a2a6a1748ae7f 100644
(file)
--- a/
src/lib/ffmpeg_examiner.h
+++ b/
src/lib/ffmpeg_examiner.h
@@
-30,8
+30,8
@@
public:
FFmpegExaminer (boost::shared_ptr<const FFmpegContent>);
float video_frame_rate () const;
FFmpegExaminer (boost::shared_ptr<const FFmpegContent>);
float video_frame_rate () const;
-
lib
dcp::Size video_size () const;
- Video
Content::
Frame video_length () const;
+ dcp::Size video_size () const;
+ VideoFrame video_length () const;
std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
return _subtitle_streams;
std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
return _subtitle_streams;