X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=nageru%2Fmixer.cpp;h=aac421126b904642ff38f131252faf50727f2be7;hp=9a86682daa91ca19b2325e3858093f55e80a0a27;hb=e01e8253288b3b706b22ea0c788c2c8f50bfac2e;hpb=6160ed8911e4ed3f7ca3589a5357ae813e27175e

diff --git a/nageru/mixer.cpp b/nageru/mixer.cpp
index 9a86682..aac4211 100644
--- a/nageru/mixer.cpp
+++ b/nageru/mixer.cpp
@@ -1137,12 +1137,9 @@ void Mixer::thread_func()
 				last_received_neutral_color[card_index] = new_frame->neutral_color;
 			}
 
-			if (new_frame->frame->data_copy != nullptr) {
-				int mjpeg_card_index = mjpeg_encoder->get_mjpeg_stream_for_card(card_index);
-				if (mjpeg_card_index != -1) {
-					RGBTriplet neutral_color = theme->get_white_balance_for_signal(card_index);
-					mjpeg_encoder->upload_frame(pts_int, mjpeg_card_index, new_frame->frame, new_frame->video_format, new_frame->y_offset, new_frame->cbcr_offset, move(raw_audio[card_index]), neutral_color);
-				}
+			if (new_frame->frame->data_copy != nullptr && mjpeg_encoder->should_encode_mjpeg_for_card(card_index)) {
+				RGBTriplet neutral_color = theme->get_white_balance_for_signal(card_index);
+				mjpeg_encoder->upload_frame(pts_int, card_index, new_frame->frame, new_frame->video_format, new_frame->y_offset, new_frame->cbcr_offset, move(raw_audio[card_index]), neutral_color);
 			}
 
 		}