diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/Manifest b/media-plugins/kodi-inputstream-ffmpegdirect/Manifest
index 9fabc4d..8a1ccdd 100644
--- a/media-plugins/kodi-inputstream-ffmpegdirect/Manifest
+++ b/media-plugins/kodi-inputstream-ffmpegdirect/Manifest
@@ -1,5 +1,6 @@
+AUX kodi-inputstream-ffmpegdirect-20.5.0-Fix-use-after-free-in-TimeshiftSegment.patch 1001 BLAKE2B ee4624253c0ab6bddd22a8ce5da969eb4e7acd22eb658eaf091fc826f714aa1314898b26a283b4e64233d4c5e5f4766a465bbbea4d4fe7b1997740a46f375d91 SHA512 608b45bf89b1430b6d25cf75f402567c1615e6457c20997efe7175aa631501eb967b5961b5dd9ff1b373de32c5d88f9a4b6da0cb92ef1866dfd81d149938e8aa
 AUX kodi-inputstream-ffmpegdirect-20.5.0-Get-extradata-with-extract_extradata-BSF.patch 9834 BLAKE2B d26b4a56ddad02488868c94670440ab369a2016416a606b9f05386b615367028379279e270771d6635c69370e670178bd4dc80d4296d8ea69165b297708ded38 SHA512 77964f8d726e6bad4ea20fc9c5320f36a20047d9d9b999cc154f78e1f38612624a742c23a45ae060289e8507cc122fbd828b6f460e9449fa3e44bbc22ac61c14
 AUX kodi-inputstream-ffmpegdirect-20.5.0-ffmpeg5.patch 13078 BLAKE2B 50fa84e7790b06960177cc48a097fca12d1f984bd41db335f98e01ebd2ecca5c4fad8e917af5af8a6d8bcc3408856542d44784834fecbd119a82ee75ec243df4 SHA512 63427c395dea7533c0909cbc43fecf8e14998bb108da50a43c2e755f8fa94cdd74751ce4b09ebc8db1780eaaf1fc717f5e4ed156443f78c9fdd6fb3bf730482b
 AUX kodi-inputstream-ffmpegdirect-20.5.0-ffmpeg6.patch 1467 BLAKE2B 1a82346927a978c059e0d69bde63451a5463fec0035b8f32ea735a1fd26374254aec3f4b60041f13a49993542f9244ebf232c734b4aff5c5cece0d1bdde2320f SHA512 6c385aad0afa07379235ee7bd70a11e434befabde46dd5185c90ad85258d4ac5451c8426354f4d6e1e16b4e7c6e6a267843c4abba9a2e6601677c2e7023ce9b1
 DIST kodi-inputstream-ffmpegdirect-20.5.0.tar.gz 289362 BLAKE2B 2e8c63bd47d54f84cade2acb092a8e3ef11c31170071f66b5f22d4aa6fd27992a22b19ecb8070ce7d952f80882fe617e5eaed70dcf325b9bdb579220ddd59688 SHA512 9db8e25f04400635e13cf7c79f7079be9c7ffbf427423abcfc449dcd06f6259dcf9ed1ad1eae1563db239978c8399e054e7c6adcbebb5cc70c4de1c01643d074
-EBUILD kodi-inputstream-ffmpegdirect-20.5.0-r1.ebuild 944 BLAKE2B 0ff3379aeba98e700c12cb27d76f23a011cd158b47ebefd6b69c14c933a9a53a3cad95ce029a41064c7e74919052a71cc0e17b7da4ca321bcf3cf4a21cf835c3 SHA512 a5bad68f5eccdad8adb0c2664cf2ae9ddb225873b89dc5078fcc593f2eb43d75c50925a035a2edf53d111d6eedb998769511203f1ce81076f1642c7843b8571c
+EBUILD kodi-inputstream-ffmpegdirect-20.5.0-r1.ebuild 1009 BLAKE2B ddc966e1726f09aefc32379f6140f89b72f9735e3ad3222a934d90e744755441a86888be34efee88eff1e95518a1c1620b7579eb8236197109299a905ec44a7a SHA512 fa701ed4639e38b6f6157d31855c146bb9ad5277f2085f76b5b7d82fa52fbab2d0abc5ecbb202f5e4cfe7b66c4431e66aac10d6bddd15153a3ed9aaf4d8d16b3
diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/files/kodi-inputstream-ffmpegdirect-20.5.0-Fix-use-after-free-in-TimeshiftSegment.patch b/media-plugins/kodi-inputstream-ffmpegdirect/files/kodi-inputstream-ffmpegdirect-20.5.0-Fix-use-after-free-in-TimeshiftSegment.patch
new file mode 100644
index 0000000..e7decb6
--- /dev/null
+++ b/media-plugins/kodi-inputstream-ffmpegdirect/files/kodi-inputstream-ffmpegdirect-20.5.0-Fix-use-after-free-in-TimeshiftSegment.patch
@@ -0,0 +1,25 @@
+From e6541a98b64631836336de17e57efa8e8e0b8425 Mon Sep 17 00:00:00 2001
+From: Vasyl Gello <vasek.gello@gmail.com>
+Date: Sat, 15 Oct 2022 16:09:20 +0000
+Subject: [PATCH] Fix use-after-free in TimeshiftSegment
+
+Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>
+---
+ src/stream/TimeshiftSegment.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/stream/TimeshiftSegment.cpp b/src/stream/TimeshiftSegment.cpp
+index 9323a44a..9e1cd09c 100644
+--- a/src/stream/TimeshiftSegment.cpp
++++ b/src/stream/TimeshiftSegment.cpp
+@@ -90,8 +90,8 @@ void TimeshiftSegment::AddPacket(DEMUX_PACKET* packet)
+   m_packetBuffer.emplace_back(newPacket);
+ 
+   int secondsSinceStart = 0;
+-  if (packet->pts != STREAM_NOPTS_VALUE && packet->pts > 0)
+-    secondsSinceStart = packet->pts / STREAM_TIME_BASE;
++  if (newPacket->pts != STREAM_NOPTS_VALUE && newPacket->pts > 0)
++    secondsSinceStart = newPacket->pts / STREAM_TIME_BASE;
+ 
+   if (secondsSinceStart != m_lastPacketSecondsSinceStart)
+   {
diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-20.5.0-r1.ebuild b/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-20.5.0-r1.ebuild
index 966b72e..c4ced91 100644
--- a/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-20.5.0-r1.ebuild
+++ b/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-20.5.0-r1.ebuild
@@ -40,6 +40,7 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${P}-ffmpeg5.patch
 	"${FILESDIR}"/${P}-Get-extradata-with-extract_extradata-BSF.patch
+	"${FILESDIR}"/${P}-Fix-use-after-free-in-TimeshiftSegment.patch
 	"${FILESDIR}"/${P}-ffmpeg6.patch
 )