diff --git a/builder/dockerfile.kali_kali-rolling.build b/builder/dockerfile.kali_kali-rolling.build
index 63bbee0..aeda46f 100644
--- a/builder/dockerfile.kali_kali-rolling.build
+++ b/builder/dockerfile.kali_kali-rolling.build
@@ -7,7 +7,10 @@ ENV DEBIAN_FRONTEND noninteractive
 ENV CXXFLAGS="-Wno-stringop-overflow"
 ENV CFLAGS="-Wno-stringop-overflow"
 
-RUN sed -i 's/Types: deb/Types: deb deb-src/' /etc/apt/sources.list.d/kali.sources
+RUN find /etc/apt/sources.list.d/ -name "*.sources" | xargs -r sed -i 's/^Types: deb$/Types: deb deb-src/'; \
+    { [ -f /etc/apt/sources.list ] && grep '^deb ' /etc/apt/sources.list 2>/dev/null; \
+      find /etc/apt/sources.list.d/ -name "*.list" -exec grep -h '^deb ' {} \; 2>/dev/null; } | \
+    sed 's/^deb /deb-src /' >> /etc/apt/sources.list.d/kali-deb-src.list; true
 
 RUN apt-get update && \
       apt-get -y install sudo
diff --git a/common/rfb/benchmark/FfmpegFrameFeeder.cpp b/common/rfb/benchmark/FfmpegFrameFeeder.cpp
index 26b0826..47e18c8 100644
--- a/common/rfb/benchmark/FfmpegFrameFeeder.cpp
+++ b/common/rfb/benchmark/FfmpegFrameFeeder.cpp
@@ -22,9 +22,7 @@
 
 FfmpegFrameFeeder::FfmpegFrameFeeder(FFmpeg *ffmpeg_) : ffmpeg{ffmpeg_} {}
 
-FfmpegFrameFeeder::~FfmpegFrameFeeder() {
-    ffmpeg->avcodec_close(codec_ctx_guard.get());
-}
+FfmpegFrameFeeder::~FfmpegFrameFeeder() = default;
 
 void FfmpegFrameFeeder::open(const std::string_view path) {
     AVFormatContext *format_ctx{};
diff --git a/common/rfb/ffmpeg.cxx b/common/rfb/ffmpeg.cxx
index 1f4309a..16be49f 100644
--- a/common/rfb/ffmpeg.cxx
+++ b/common/rfb/ffmpeg.cxx
@@ -120,7 +120,6 @@ FFmpeg::FFmpeg() {
         avcodec_receive_packet_f = D_LOOKUP_SYM(handle, avcodec_receive_packet);
         av_packet_unref_f = D_LOOKUP_SYM(handle, av_packet_unref);
         avcodec_flush_buffers_f = D_LOOKUP_SYM(handle, avcodec_flush_buffers);
-        avcodec_close_f = D_LOOKUP_SYM(handle, avcodec_close);
         av_codec_is_encoder_f = D_LOOKUP_SYM(handle, av_codec_is_encoder);
         av_packet_alloc_f = D_LOOKUP_SYM(handle, av_packet_alloc);
         av_packet_free_f = D_LOOKUP_SYM(handle, av_packet_free);
diff --git a/common/rfb/ffmpeg.h b/common/rfb/ffmpeg.h
index 5155ae7..3701eb6 100644
--- a/common/rfb/ffmpeg.h
+++ b/common/rfb/ffmpeg.h
@@ -137,7 +137,6 @@ class FFmpeg final {
     using avcodec_receive_frame_func = int (*)(AVCodecContext *avctx, AVFrame *frame);
     using av_packet_unref_func = void (*)(AVPacket *pkt);
     using avcodec_flush_buffers_func = void (*)(AVCodecContext *avctx);
-    using avcodec_close_func = int (*)(AVCodecContext *avctx);
     using av_codec_is_encoder_func = int (*)(const AVCodec *codec);
 
     // libavfilter
@@ -201,7 +200,6 @@ class FFmpeg final {
     avcodec_receive_packet_func avcodec_receive_packet_f{};
     av_packet_unref_func av_packet_unref_f{};
     avcodec_flush_buffers_func avcodec_flush_buffers_f{};
-    avcodec_close_func avcodec_close_f{};
     av_codec_is_encoder_func av_codec_is_encoder_f{};
 
     // libavfilter
@@ -386,10 +384,6 @@ public:
         avcodec_flush_buffers_f(avctx);
     }
 
-    int avcodec_close(AVCodecContext *avctx) const {
-        return avcodec_close_f(avctx);
-    }
-
     int av_codec_is_encoder(const AVCodec *codec) const {
         return av_codec_is_encoder_f(codec);
     }