From cc5433e4362f6131913740d2abd111804ab0e46a Mon Sep 17 00:00:00 2001 From: Dan Dennedy Date: Tue, 27 Nov 2012 09:18:25 -0800 Subject: [PATCH] Fix mlt_profile to DeckLink DisplayMode matching. --- src/modules/decklink/consumer_decklink.cpp | 2 +- src/modules/decklink/producer_decklink.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/decklink/consumer_decklink.cpp b/src/modules/decklink/consumer_decklink.cpp index 9df9a261..f8ef0cde 100644 --- a/src/modules/decklink/consumer_decklink.cpp +++ b/src/modules/decklink/consumer_decklink.cpp @@ -75,7 +75,7 @@ private: mlt_log_verbose( getConsumer(), "BMD mode %dx%d %.3f fps prog %d\n", m_width, m_height, m_fps, p ); if ( m_width == profile->width && p == profile->progressive - && m_fps == mlt_profile_fps( profile ) + && (int) m_fps == (int) mlt_profile_fps( profile ) && ( m_height == profile->height || ( m_height == 486 && profile->height == 480 ) ) ) result = mode; else diff --git a/src/modules/decklink/producer_decklink.cpp b/src/modules/decklink/producer_decklink.cpp index 6a8492be..51456120 100644 --- a/src/modules/decklink/producer_decklink.cpp +++ b/src/modules/decklink/producer_decklink.cpp @@ -67,7 +67,7 @@ private: if ( width == profile->width && p == profile->progressive && ( height + vancLines == profile->height || ( height == 486 && profile->height == 480 + vancLines ) ) - && fps == mlt_profile_fps( profile ) ) + && (int) fps == (int) mlt_profile_fps( profile ) ) result = mode->GetDisplayMode(); SAFE_RELEASE( mode ); } -- 2.39.2