X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fkaeru.cpp;h=554259acd80a6a5bb8f7c17919100e388dd990ce;hb=f81ae3be1aae619fe4ad022f55d95a4a83ace076;hp=1699d243491900f45a1c1fdfb8f0db7bc3efc874;hpb=2f92c975a3cf9f4803a58267fd2a12765e34a69e;p=nageru diff --git a/nageru/kaeru.cpp b/nageru/kaeru.cpp index 1699d24..554259a 100644 --- a/nageru/kaeru.cpp +++ b/nageru/kaeru.cpp @@ -6,20 +6,45 @@ #include "flags.h" #include "ffmpeg_capture.h" #include "mixer.h" +#include "print_latency.h" +#include "shared/ffmpeg_raii.h" +#include "shared/httpd.h" #include "shared/mux.h" #include "quittable_sleeper.h" +#include "shared/shared_defs.h" #include "shared/timebase.h" #include "x264_encoder.h" #include -#include -#include -#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include extern "C" { #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include } using namespace bmusb; @@ -66,7 +91,7 @@ int write_packet(void *opaque, uint8_t *buf, int buf_size, AVIODataMarkerType ty unique_ptr create_mux(HTTPD *httpd, const AVOutputFormat *oformat, X264Encoder *x264_encoder, AudioEncoder *audio_encoder) { AVFormatContext *avctx = avformat_alloc_context(); - avctx->oformat = const_castoformat)>(oformat); // const_cast is a hack to work in FFmpeg both before and after 5.0. + avctx->oformat = oformat; // const_cast is a hack to work in FFmpeg both before and after 5.0. uint8_t *buf = (uint8_t *)av_malloc(MUX_BUFFER_SIZE); avctx->pb = avio_alloc_context(buf, MUX_BUFFER_SIZE, 1, httpd, nullptr, nullptr, nullptr);