]> git.sesse.net Git - casparcg/commitdiff
Fixed compilation problem in Linux
authorHelge Norberg <helge.norberg@svt.se>
Fri, 14 Aug 2015 11:35:38 +0000 (13:35 +0200)
committerHelge Norberg <helge.norberg@svt.se>
Fri, 14 Aug 2015 11:35:38 +0000 (13:35 +0200)
modules/decklink/consumer/decklink_consumer.cpp
modules/ffmpeg/consumer/ffmpeg_consumer.cpp
modules/screen/consumer/screen_consumer.cpp

index a7fb046a10d3283f77df2d69f7fd2268c790bbcb..d68fa281907ec363e2feb52b088469842b9bf444 100644 (file)
@@ -587,7 +587,7 @@ public:
 
        int64_t presentation_frame_age_millis() const override
        {
-               return consumer_ ? consumer_->current_presentation_delay_ : 0;
+               return consumer_ ? static_cast<int64_t>(consumer_->current_presentation_delay_) : 0;
        }
 
        core::monitor::subject& monitor_output()
index 623e25a014b4c694b3894b5d5cff04107a92af85..485fc23561b4bc5d7981ae251d00fcfd155d1cfe 100644 (file)
@@ -791,7 +791,7 @@ public:
 
        int64_t presentation_frame_age_millis() const override
        {
-               return consumer_ ? consumer_->current_encoding_delay_ : 0;
+               return consumer_ ? static_cast<int64_t>(consumer_->current_encoding_delay_) : 0;
        }
 
        std::future<bool> send(core::const_frame frame) override
index 5cf0f2ba843c19e411a91807abe3ba3097a78c08..8e563ae4f1c345e4cc17565874f6a65c0ae35150 100644 (file)
@@ -607,7 +607,7 @@ public:
 
        int64_t presentation_frame_age_millis() const override
        {
-               return consumer_ ? consumer_->current_presentation_age_ : 0;
+               return consumer_ ? static_cast<int64_t>(consumer_->current_presentation_age_) : 0;
        }
 
        std::future<bool> send(core::const_frame frame) override