X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fkaeru.cpp;h=ce58aef9473f3da33112ca5d72e5d8ca5da24ded;hb=bdc9f1ea04141e71906d486f9d254c3346835e72;hp=1a63bb04337ca56841033b9628908c39b7083f8f;hpb=6d7e33f5d48c4c0a7c5a163d4a16d564e43f6c43;p=nageru diff --git a/nageru/kaeru.cpp b/nageru/kaeru.cpp index 1a63bb0..ce58aef 100644 --- a/nageru/kaeru.cpp +++ b/nageru/kaeru.cpp @@ -18,6 +18,10 @@ #include #include +extern "C" { +#include +} + using namespace bmusb; using namespace movit; using namespace std; @@ -59,7 +63,7 @@ int write_packet(void *opaque, uint8_t *buf, int buf_size, AVIODataMarkerType ty } // namespace -unique_ptr create_mux(HTTPD *httpd, AVOutputFormat *oformat, X264Encoder *x264_encoder, AudioEncoder *audio_encoder) +unique_ptr create_mux(HTTPD *httpd, const AVOutputFormat *oformat, X264Encoder *x264_encoder, AudioEncoder *audio_encoder) { AVFormatContext *avctx = avformat_alloc_context(); avctx->oformat = oformat; @@ -220,7 +224,7 @@ int main(int argc, char *argv[]) HTTPD httpd; - AVOutputFormat *oformat = av_guess_format(global_flags.stream_mux_name.c_str(), nullptr, nullptr); + const AVOutputFormat *oformat = av_guess_format(global_flags.stream_mux_name.c_str(), nullptr, nullptr); assert(oformat != nullptr); unique_ptr audio_encoder;