Skip to content

Commit

Permalink
fix: changing channel videomode fails when consumer is attached
Browse files Browse the repository at this point in the history
  • Loading branch information
Julusian committed Oct 5, 2023
1 parent 8062a41 commit bdcd3fd
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions src/core/consumer/output.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,6 @@ struct output::impl
return;
}

if (input_frame1.size() != format_desc_.size) {
CASPAR_LOG(warning) << print() << L" Invalid input frame size.";
return;
}

if (input_frame2 && input_frame2.size() != format_desc_.size) {
CASPAR_LOG(warning) << print() << L" Invalid input frame size.";
return;
}

auto time = std::move(time_);

if (format_desc_ != format_desc) {
Expand All @@ -116,6 +106,16 @@ struct output::impl
return;
}

if (input_frame1.size() != format_desc_.size) {
CASPAR_LOG(warning) << print() << L" Invalid input frame size.";
return;
}

if (input_frame2 && input_frame2.size() != format_desc_.size) {
CASPAR_LOG(warning) << print() << L" Invalid input frame size.";
return;
}

decltype(consumers_) consumers;
{
std::lock_guard<std::mutex> lock(consumers_mutex_);
Expand Down

0 comments on commit bdcd3fd

Please sign in to comment.