X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fkaeru.cpp;h=9d9738391082a484cf3338361c2746aff1aa5ec7;hb=b280eea4c3fa09472595dd62538e036f2dbcaff5;hp=84bb7ad5692d8125a876f4e151e00684e5a6241f;hpb=09947919ec65bb3525b1eb804e9e78d9bbeac363;p=nageru diff --git a/nageru/kaeru.cpp b/nageru/kaeru.cpp index 84bb7ad..9d97383 100644 --- a/nageru/kaeru.cpp +++ b/nageru/kaeru.cpp @@ -73,7 +73,7 @@ unique_ptr create_mux(HTTPD *httpd, AVOutputFormat *oformat, X264Encoder *x unique_ptr mux; mux.reset(new Mux(avctx, global_flags.width, global_flags.height, Mux::CODEC_H264, video_extradata, audio_encoder->get_codec_parameters().get(), - get_color_space(global_flags.ycbcr_rec709_coefficients), Mux::WITH_AUDIO, COARSE_TIMEBASE, + get_color_space(global_flags.ycbcr_rec709_coefficients), COARSE_TIMEBASE, /*write_callback=*/nullptr, Mux::WRITE_FOREGROUND, { &stream_mux_metrics })); stream_mux_metrics.init({{ "destination", "http" }}); return mux; @@ -225,6 +225,7 @@ int main(int argc, char *argv[]) video.stop_dequeue_thread(); // Stop the x264 encoder before killing the mux it's writing to. + global_x264_encoder = nullptr; x264_encoder.reset(); return 0; }