diff --git a/buildscripts/patches/ffmpeg/FFmpeg-devel-v2-avcodec-mediacodecdec-call-MediaCodec.stop-on-close.diff b/buildscripts/patches/ffmpeg/FFmpeg-devel-v2-avcodec-mediacodecdec-call-MediaCodec.stop-on-close.diff
new file mode 100644
index 0000000..8b340f5
--- /dev/null
+++ b/buildscripts/patches/ffmpeg/FFmpeg-devel-v2-avcodec-mediacodecdec-call-MediaCodec.stop-on-close.diff
@@ -0,0 +1,43 @@
+From 9aa111c400cc3245edf870c431a5e271432ef5f2 Mon Sep 17 00:00:00 2001
+From: sfan5 <sfan5@live.de>
+Date: Wed, 7 Aug 2024 17:48:06 +0200
+Subject: [PATCH v2] avcodec/mediacodecdec: call MediaCodec.stop on close
+
+Usually the MediaCodec context will be released immediately, or it needs to stay
+alive due to existing hardware buffers.
+
+However we can free resources early in the case of
+hw_buffer_count == 0 && refcount > 1, which can be reproduced by keeping frames
+referenced after flushing and closing. mpv currently behaves like this.
+
+Signed-off-by: sfan5 <sfan5@live.de>
+---
+ libavcodec/mediacodecdec_common.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/libavcodec/mediacodecdec_common.c b/libavcodec/mediacodecdec_common.c
+index d6f91e6e89..c888dea8cf 100644
+--- a/libavcodec/mediacodecdec_common.c
++++ b/libavcodec/mediacodecdec_common.c
+@@ -841,6 +841,18 @@ int ff_mediacodec_dec_flush(AVCodecContext *avctx, MediaCodecDecContext *s)
+ 
+ int ff_mediacodec_dec_close(AVCodecContext *avctx, MediaCodecDecContext *s)
+ {
++    if (!s)
++        return 0;
++
++    if (s->codec) {
++        if (atomic_load(&s->hw_buffer_count) == 0) {
++            ff_AMediaCodec_stop(s->codec);
++            av_log(avctx, AV_LOG_DEBUG, "MediaCodec %p stopped\n", s->codec);
++        } else {
++            av_log(avctx, AV_LOG_DEBUG, "Not stopping MediaCodec (there are buffers pending)\n");
++        }
++    }
++
+     ff_mediacodec_dec_unref(s);
+ 
+     return 0;
+-- 
+2.46.0
+