Fix some memory leaks in the VA-API upload code (also make it more RAII-ish to be...

[nageru] / nageru / mixer.cpp

diff --git a/nageru/mixer.cpp b/nageru/mixer.cpp
index e0aa8b1fe27783c685dde0c142a8be586dcb89cf..32c1984fa4c3ee89dd214695a26113c5729f554d 100644 (file)
--- a/nageru/mixer.cpp
+++ b/nageru/mixer.cpp
@@ -1083,9 +1083,7 @@ void Mixer::thread_func()
 
                        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) {
-                                       mjpeg_encoder->finish_frame(new_frame->frame);
-                               } else {
+                               if (mjpeg_card_index != -1) {
                                        mjpeg_encoder->upload_frame(pts_int, mjpeg_card_index, new_frame->frame, new_frame->video_format, new_frame->y_offset, new_frame->cbcr_offset);
                                }
                        }