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.cc | |
| 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.cc')
| -rw-r--r-- | src/lib/ffmpeg_examiner.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc index 5ca05dd55..1d01981f6 100644 --- a/src/lib/ffmpeg_examiner.cc +++ b/src/lib/ffmpeg_examiner.cc @@ -156,7 +156,7 @@ FFmpegExaminer::frame_time (AVStream* s) const return t; } -float +optional<float> FFmpegExaminer::video_frame_rate () const { /* This use of r_frame_rate is debateable; there's a few different |