diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-12-03 10:12:35 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-12-03 10:12:35 +0000 |
| commit | c008066160d85b9ec9e5485375d7baaa5d27bda2 (patch) | |
| tree | cf2876d69549119bf22761c5f6eccb568242b647 /src/lib/ffmpeg_examiner.h | |
| parent | 996fa2194581bf95113b9778849654893c414889 (diff) | |
Hand-apply 6a3cd511559433554ab40ed72ff94b7d8dc2c5bd from master;
Basics of an image sequence dialog that asks about frame rate and
digest calculation.
Diffstat (limited to 'src/lib/ffmpeg_examiner.h')
| -rw-r--r-- | src/lib/ffmpeg_examiner.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h index 59c3299b2..4378e241b 100644 --- a/src/lib/ffmpeg_examiner.h +++ b/src/lib/ffmpeg_examiner.h @@ -29,7 +29,7 @@ class FFmpegExaminer : public FFmpeg, public VideoExaminer public: FFmpegExaminer (boost::shared_ptr<const FFmpegContent>); - float video_frame_rate () const; + boost::optional<float> video_frame_rate () const; dcp::Size video_size () const; ContentTime video_length () const; boost::optional<float> sample_aspect_ratio () const; |