From: Steinar H. Gunderson Date: Fri, 1 Mar 2024 10:53:51 +0000 (+0100) Subject: Remove a workaround for FFmpeg before 5.0. X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=fb65325fa7865b45d2799f3a916fcbae517e38cf Remove a workaround for FFmpeg before 5.0. We require 5.1 now anyway. --- diff --git a/nageru/kaeru.cpp b/nageru/kaeru.cpp index 1699d24..52cf70f 100644 --- a/nageru/kaeru.cpp +++ b/nageru/kaeru.cpp @@ -66,7 +66,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);