From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sat, 25 Jun 2016 21:22:03 +0000 (+0200)
Subject: Fix a crash when not encoding to x264.
X-Git-Tag: 1.3.0~1
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=355343173dcb39cff811baff55e18977d6b49472;p=nageru

Fix a crash when not encoding to x264.
---

diff --git a/video_encoder.cpp b/video_encoder.cpp
index 4b62e9b..07bb1c9 100644
--- a/video_encoder.cpp
+++ b/video_encoder.cpp
@@ -55,7 +55,9 @@ VideoEncoder::VideoEncoder(ResourcePool *resource_pool, QSurface *surface, const
 	open_output_stream();
 	stream_audio_encoder->add_mux(stream_mux.get());
 	quicksync_encoder->set_stream_mux(stream_mux.get());
-	x264_encoder->set_mux(stream_mux.get());
+	if (global_flags.x264_video_to_http) {
+		x264_encoder->set_mux(stream_mux.get());
+	}
 }
 
 VideoEncoder::~VideoEncoder()