diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-02-22 01:25:03 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-02-22 01:25:03 +0100 |
| commit | a45f6245e8cc785fab436c9282fa3d1baf3a8575 (patch) | |
| tree | c6ae82be2319446c35ebad6666f68dbb109f8904 /src/lib/ffmpeg_examiner.cc | |
| parent | 6c3ded5baac385d95ec2cf5e625c6c796c23e318 (diff) | |
| parent | 3ffd0163026be24e5373e0674c3301ed37546e44 (diff) | |
Merge tag 'v2.16.78' into v2.17.xv2.17.12
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 824b496d8..583ea1297 100644 --- a/src/lib/ffmpeg_examiner.cc +++ b/src/lib/ffmpeg_examiner.cc @@ -297,7 +297,7 @@ FFmpegExaminer::video_frame_rate () const } -dcp::Size +optional<dcp::Size> FFmpegExaminer::video_size () const { return dcp::Size (video_codec_context()->width, video_codec_context()->height); |