From: Steinar H. Gunderson Date: Mon, 24 Aug 2020 21:08:54 +0000 (+0200) Subject: Fix a bug; 60.00 fps would never be autoselected for output. (Then again, 59.97 shoul... X-Git-Tag: 2.0.2~22 X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=6ed3174dcc38c31c6b479494ad744c09941475eb Fix a bug; 60.00 fps would never be autoselected for output. (Then again, 59.97 should always exist.) --- diff --git a/nageru/decklink_output.cpp b/nageru/decklink_output.cpp index 29cb3a8..3dd5243 100644 --- a/nageru/decklink_output.cpp +++ b/nageru/decklink_output.cpp @@ -439,7 +439,7 @@ uint32_t DeckLinkOutput::pick_video_mode(uint32_t mode) const } // Prioritize 59.94 > 60 > 29.97. If none of those are found, then pick the highest one. - for (const pair &desired : vector>{ { 60000, 1001 }, { 60, 0 }, { 30000, 1001 } }) { + for (const pair &desired : vector>{ { 60000, 1001 }, { 60, 1 }, { 30000, 1001 } }) { for (const auto &it : video_modes) { if (it.second.frame_rate_num * desired.second == desired.first * it.second.frame_rate_den) { return it.first;