diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-12-09 16:30:31 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-12-09 16:30:31 +0000 |
| commit | 91f71a29f894c382a7f92cf5fdcb75d9849e2aa7 (patch) | |
| tree | 8b8fcc0f64287367d6555b54f212150f25ddff26 /src/lib/video_content.cc | |
| parent | 5527d5e1dd40f759e5e4a33561fe89313d23fa20 (diff) | |
Various fixes pointed out by tests.
Diffstat (limited to 'src/lib/video_content.cc')
| -rw-r--r-- | src/lib/video_content.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 1fe02bae4..1da5d87c1 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -228,9 +228,8 @@ VideoContent::take_from_video_examiner (shared_ptr<VideoExaminer> d) { boost::mutex::scoped_lock lm (_mutex); _video_size = vs; - if (vfr) { - _video_frame_rate = vfr.get (); - } + /* Default video frame rate to 24fps if the examiner doesn't know */ + _video_frame_rate = vfr.get_value_or (24); _video_length = vl; _sample_aspect_ratio = ar; |