X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fmixer%2Fmixer.cpp;h=c663d7d2250cdb222a3f35b585b102dcbd361c4e;hb=1c1d1f8ace8c4128d192390afb2dc5f489b98d01;hp=e06bd2df1c9ff0c5fb0e7c1f86d8a02b6f11b17e;hpb=756019c2518d320c51cf425a6a39512173a66b30;p=casparcg diff --git a/core/mixer/mixer.cpp b/core/mixer/mixer.cpp index e06bd2df1..c663d7d22 100644 --- a/core/mixer/mixer.cpp +++ b/core/mixer/mixer.cpp @@ -210,7 +210,7 @@ private: auto frame1 = make_safe(frame.second); frame1->get_image_transform() = image_transforms[frame.first].fetch_and_tick(1); - if(channel_.get_format_desc().mode != core::video_mode::progressive) + if(channel_.get_format_desc().mode != core::field_mode::progressive) { auto frame2 = make_safe(frame.second); frame2->get_image_transform() = image_transforms[frame.first].fetch_and_tick(1); @@ -232,7 +232,7 @@ private: BOOST_FOREACH(auto& frame, frames) { - const unsigned int num = channel_.get_format_desc().mode == core::video_mode::progressive ? 1 : 2; + const unsigned int num = channel_.get_format_desc().mode == core::field_mode::progressive ? 1 : 2; auto frame1 = make_safe(frame.second); frame1->get_audio_transform() = audio_transforms[frame.first].fetch_and_tick(num);