diff --git a/packages/multimedia/ffmpeg/package.mk b/packages/multimedia/ffmpeg/package.mk
index 56536f2c6b..9a297e248f 100644
--- a/packages/multimedia/ffmpeg/package.mk
+++ b/packages/multimedia/ffmpeg/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="ffmpeg"
-PKG_VERSION="2.8.4"
+PKG_VERSION="2.8.5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPLv2.1+"
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-2.8-kodi.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-2.8-kodi.patch
index df3d3e628b..27b2c1b973 100644
--- a/packages/multimedia/ffmpeg/patches/ffmpeg-2.8-kodi.patch
+++ b/packages/multimedia/ffmpeg/patches/ffmpeg-2.8-kodi.patch
@@ -583,30 +583,3 @@ index f9754eb..cc23f80 100755
  fi
  
  # no revision number found
-
-From 249bf32ec3db11916b7705164cb14aefbf627761 Mon Sep 17 00:00:00 2001
-From: Michael Niedermayer <michael@niedermayer.cc>
-Date: Tue, 22 Dec 2015 16:19:44 +0100
-Subject: [PATCH 13/13] avformat/mov: Update handbrake_version threshold for
- full mp3 parsing
-
-Fixes: Endangered\ Species\ 1x01\ Collecting\ Merl.mp4
-
-Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
----
- libavformat/mov.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libavformat/mov.c b/libavformat/mov.c
-index 2c364ac..8534bf9 100644
---- a/libavformat/mov.c
-+++ b/libavformat/mov.c
-@@ -4535,7 +4535,7 @@ static int mov_read_header(AVFormatContext *s)
-             }
-         }
-         if (mov->handbrake_version &&
--            mov->handbrake_version <= 1000000*0 + 1000*10 + 0 &&  // 0.10.0
-+            mov->handbrake_version <= 1000000*0 + 1000*10 + 2 &&  // 0.10.2
-             st->codec->codec_id == AV_CODEC_ID_MP3
-         ) {
-             av_log(s, AV_LOG_VERBOSE, "Forcing full parsing for mp3 stream\n");