From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sat, 14 Nov 2015 12:56:01 +0000 (+0100)
Subject: Kill the H.264 encoder a bit earlier during shutdown; seems easier to debug shutdown... 
X-Git-Tag: 1.0.0~126
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=3ae7d61b33c4c854ec2611807383903df99160ca;p=nageru

Kill the H.264 encoder a bit earlier during shutdown; seems easier to debug shutdown with fewer threads around.
---

diff --git a/mixer.cpp b/mixer.cpp
index 6ea3be3..f044ecd 100644
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -174,6 +174,8 @@ Mixer::~Mixer()
 		}
 		cards[card_index].usb->stop_dequeue_thread();
 	}
+
+	h264_encoder.reset(nullptr);
 }
 
 namespace {