diff --git a/make/target-ffmpeg.mk b/make/target-ffmpeg.mk
index 421481d2..e0e19423 100644
--- a/make/target-ffmpeg.mk
+++ b/make/target-ffmpeg.mk
@@ -3,7 +3,7 @@
 #
 # -----------------------------------------------------------------------------
 
-FFMPEG_VER    = 4.2.1
+FFMPEG_VER    = 4.2.2
 FFMPEG_TMP    = ffmpeg-$(FFMPEG_VER)
 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VER).tar.xz
 FFMPEG_URL    = http://www.ffmpeg.org/releases
@@ -356,7 +356,7 @@ ffmpeg: $(FFMPEG_DEPS) $(ARCHIVE)/$(FFMPEG_SOURCE) | $(TARGET_DIR)
 	$(UNTAR)/$(FFMPEG_SOURCE)
 ifneq ($(FFMPEG_UNPATCHED), yes)
 	$(CHDIR)/$(FFMPEG_TMP); \
-		$(call apply_patches, $(FFMPEG_PATCH))
+		$(call apply_patches, $(addprefix $(@F)/,$(FFMPEG_PATCH)))
 endif
 	$(CHDIR)/$(FFMPEG_TMP); \
 		./configure \
diff --git a/patches/ffmpeg-02-fix_mpegts.patch b/patches/ffmpeg/ffmpeg-02-fix_mpegts.patch
similarity index 100%
rename from patches/ffmpeg-02-fix_mpegts.patch
rename to patches/ffmpeg/ffmpeg-02-fix_mpegts.patch
diff --git a/patches/ffmpeg-03-allow_to_choose_rtmp_impl_at_runtime.patch b/patches/ffmpeg/ffmpeg-03-allow_to_choose_rtmp_impl_at_runtime.patch
similarity index 100%
rename from patches/ffmpeg-03-allow_to_choose_rtmp_impl_at_runtime.patch
rename to patches/ffmpeg/ffmpeg-03-allow_to_choose_rtmp_impl_at_runtime.patch
diff --git a/patches/ffmpeg-04-hls_replace_key_uri.patch b/patches/ffmpeg/ffmpeg-04-hls_replace_key_uri.patch
similarity index 100%
rename from patches/ffmpeg-04-hls_replace_key_uri.patch
rename to patches/ffmpeg/ffmpeg-04-hls_replace_key_uri.patch
diff --git a/patches/ffmpeg-06-optimize_aac.patch b/patches/ffmpeg/ffmpeg-06-optimize_aac.patch
similarity index 97%
rename from patches/ffmpeg-06-optimize_aac.patch
rename to patches/ffmpeg/ffmpeg-06-optimize_aac.patch
index e207f526..74fdd414 100644
--- a/patches/ffmpeg-06-optimize_aac.patch
+++ b/patches/ffmpeg/ffmpeg-06-optimize_aac.patch
@@ -1,6 +1,6 @@
 --- a/libavcodec/aacdec_template.c
 +++ b/libavcodec/aacdec_template.c
-@@ -2482,7 +2482,7 @@ static int decode_extension_payload(AACContext *ac, GetBitContext *gb, int cnt,
+@@ -2485,7 +2485,7 @@ static int decode_extension_payload(AACContext *ac, GetBitContext *gb, int cnt,
   * @param   decode  1 if tool is used normally, 0 if tool is used in LTP.
   * @param   coef    spectral coefficients
   */
diff --git a/patches/ffmpeg-07-increase_buffer_size.patch b/patches/ffmpeg/ffmpeg-07-increase_buffer_size.patch
similarity index 100%
rename from patches/ffmpeg-07-increase_buffer_size.patch
rename to patches/ffmpeg/ffmpeg-07-increase_buffer_size.patch
diff --git a/patches/ffmpeg-08-recheck_discard_flags.patch b/patches/ffmpeg/ffmpeg-08-recheck_discard_flags.patch
similarity index 94%
rename from patches/ffmpeg-08-recheck_discard_flags.patch
rename to patches/ffmpeg/ffmpeg-08-recheck_discard_flags.patch
index 35e3be0a..ee134fae 100644
--- a/patches/ffmpeg-08-recheck_discard_flags.patch
+++ b/patches/ffmpeg/ffmpeg-08-recheck_discard_flags.patch
@@ -1,6 +1,6 @@
 --- a/libavformat/hls.c
 +++ b/libavformat/hls.c
-@@ -2074,8 +2074,10 @@
+@@ -2080,8 +2080,10 @@
      HLSContext *c = s->priv_data;
      int ret, i, minplaylist = -1;
  
diff --git a/patches/ffmpeg-09-fix_edit_list_parsing.patch b/patches/ffmpeg/ffmpeg-09-fix_edit_list_parsing.patch
similarity index 100%
rename from patches/ffmpeg-09-fix_edit_list_parsing.patch
rename to patches/ffmpeg/ffmpeg-09-fix_edit_list_parsing.patch
diff --git a/patches/ffmpeg-mips64_cpu_detection.patch b/patches/ffmpeg/ffmpeg-mips64_cpu_detection.patch
similarity index 100%
rename from patches/ffmpeg-mips64_cpu_detection.patch
rename to patches/ffmpeg/ffmpeg-mips64_cpu_detection.patch