From: André Apitzsch Date: Sun, 23 Jun 2024 14:41:28 +0000 (+0200) Subject: Fix function passed to avio_alloc_context() (ffmpeg 7) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c3a8af8f5f31303e7be91eca29b70b1b8dfad59;p=thirdparty%2Ftvheadend.git Fix function passed to avio_alloc_context() (ffmpeg 7) --- diff --git a/src/input/mpegts/iptv/iptv_libav.c b/src/input/mpegts/iptv/iptv_libav.c index bdba7d600..5e60f5a12 100644 --- a/src/input/mpegts/iptv/iptv_libav.c +++ b/src/input/mpegts/iptv/iptv_libav.c @@ -46,8 +46,13 @@ typedef struct { /* * */ +#if LIBAVFORMAT_VERSION_MAJOR > 60 +static int +iptv_libav_write_packet(void *opaque, const uint8_t *buf, int buf_size) +#else static int iptv_libav_write_packet(void *opaque, uint8_t *buf, int buf_size) +#endif { iptv_libav_priv_t *la = opaque; diff --git a/src/muxer/muxer_libav.c b/src/muxer/muxer_libav.c index e4c975855..b62671f41 100644 --- a/src/muxer/muxer_libav.c +++ b/src/muxer/muxer_libav.c @@ -55,8 +55,13 @@ static const AVRational mpeg_tc = {1, 90000}; /** * Callback function for libavformat */ -static int +#if LIBAVFORMAT_VERSION_MAJOR > 60 +static int +lav_muxer_write(void *opaque, const uint8_t *buf, int buf_size) +#else +static int lav_muxer_write(void *opaque, uint8_t *buf, int buf_size) +#endif { int r; lav_muxer_t *lm = (lav_muxer_t*)opaque;