From: Jaroslav Kysela Date: Sat, 2 Sep 2017 19:57:41 +0000 (+0200) Subject: transcode: fix memory leaks X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ccebae22748d17d2a62ea389f2ca02951635ee0;p=thirdparty%2Ftvheadend.git transcode: fix memory leaks --- diff --git a/src/transcoding/transcode/hwaccels/hwaccels.c b/src/transcoding/transcode/hwaccels/hwaccels.c index 44f1db106..cb063be9e 100644 --- a/src/transcoding/transcode/hwaccels/hwaccels.c +++ b/src/transcoding/transcode/hwaccels/hwaccels.c @@ -18,6 +18,7 @@ */ #include "hwaccels.h" +#include "../internals.h" #if ENABLE_VAAPI #include "vaapi.h" @@ -90,7 +91,9 @@ hwaccels_decode_get_format(AVCodecContext *avctx, void hwaccels_decode_close_context(AVCodecContext *avctx) { - if (avctx->hwaccel_context) { + TVHContext *ctx = avctx->opaque; + + if (ctx->hw_accel_ictx) { switch (avctx->pix_fmt) { #if ENABLE_VAAPI case AV_PIX_FMT_VAAPI: @@ -100,7 +103,7 @@ hwaccels_decode_close_context(AVCodecContext *avctx) default: break; } - avctx->hwaccel_context = NULL; + ctx->hw_accel_ictx = NULL; } } diff --git a/src/transcoding/transcode/transcoder.c b/src/transcoding/transcode/transcoder.c index 88312366a..44d1fcb7c 100644 --- a/src/transcoding/transcode/transcoder.c +++ b/src/transcoding/transcode/transcoder.c @@ -330,6 +330,7 @@ tvh_transcoder_deliver(TVHTranscoder *self, th_pkt_t *pkt) tvh_transcoder_log(self, LOG_ERR, "failed to create message"); return -1; } + pkt_ref_dec(pkt); streaming_target_deliver2(self->output, msg); return 0; }