]> git.sesse.net Git - nageru/commitdiff
Fix a crash when not encoding to x264.
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 25 Jun 2016 21:22:03 +0000 (23:22 +0200)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 25 Jun 2016 21:22:03 +0000 (23:22 +0200)
video_encoder.cpp

index 4b62e9b29cf37be5c565f938f99a6f3ad28e6849..07bb1c95a1fb8aa72c35d3615f9c75676697bf2c 100644 (file)
@@ -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()