X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=kaeru.cpp;h=10f1e9394b2a5c0ddab4e42a226b0ff7af4ccc73;hb=6ffaabac0a523617b686f40c154a25cb548cc561;hp=011818d35832741321e4ce2b0970fa712a0e62af;hpb=8d846a0cf80b24e9189389b1d0e126a0a717c86d;p=nageru diff --git a/kaeru.cpp b/kaeru.cpp index 011818d..10f1e93 100644 --- a/kaeru.cpp +++ b/kaeru.cpp @@ -1,5 +1,4 @@ // Kaeru (換える), a simple transcoder intended for use with Nageru. -// This is experimental code, not yet supported. #include "audio_encoder.h" #include "basic_stats.h" @@ -129,7 +128,7 @@ void video_frame_callback(FFmpegCapture *video, X264Encoder *x264_encoder, Audio void audio_frame_callback(Mux *mux, const AVPacket *pkt, AVRational timebase) { - mux->add_packet(*pkt, pkt->pts, pkt->dts == AV_NOPTS_VALUE ? pkt->pts : pkt->dts, timebase); + mux->add_packet(*pkt, pkt->pts, pkt->dts == AV_NOPTS_VALUE ? pkt->pts : pkt->dts, timebase, /*stream_index=*/1); } void adjust_bitrate(int signal) @@ -172,7 +171,9 @@ int main(int argc, char *argv[]) } global_flags.num_cards = 1; // For latency metrics. +#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 9, 100) av_register_all(); +#endif avformat_network_init(); HTTPD httpd;