diff --git a/0001-avcodec-cbs_jpeg-Check-length-for-SOS.patch b/0001-avcodec-cbs_jpeg-Check-length-for-SOS.patch
new file mode 100644
index 0000000..07ff6df
--- /dev/null
+++ b/0001-avcodec-cbs_jpeg-Check-length-for-SOS.patch
@@ -0,0 +1,32 @@
+From 1812352d767ccf5431aa440123e2e260a4db2726 Mon Sep 17 00:00:00 2001
+From: Michael Niedermayer <michael@niedermayer.cc>
+Date: Sat, 7 Mar 2020 15:42:58 +0100
+Subject: [PATCH] avcodec/cbs_jpeg: Check length for SOS
+
+Fixes: out of array access
+Fixes: 19734/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5673507031875584
+Fixes: 19353/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5703944462663680
+
+Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
+Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
+---
+ libavcodec/cbs_jpeg.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/libavcodec/cbs_jpeg.c b/libavcodec/cbs_jpeg.c
+index 6bbce5f89b..89512a26bb 100644
+--- a/libavcodec/cbs_jpeg.c
++++ b/libavcodec/cbs_jpeg.c
+@@ -197,6 +197,9 @@ static int cbs_jpeg_split_fragment(CodedBitstreamContext *ctx,
+         if (marker == JPEG_MARKER_SOS) {
+             length = AV_RB16(frag->data + start);
+ 
++            if (length > end - start)
++                return AVERROR_INVALIDDATA;
++
+             data_ref = NULL;
+             data     = av_malloc(end - start +
+                                  AV_INPUT_BUFFER_PADDING_SIZE);
+-- 
+2.26.2
+
diff --git a/enable_decoders b/enable_decoders
index 48c31d6..8d2b80f 100644
--- a/enable_decoders
+++ b/enable_decoders
@@ -30,15 +30,15 @@ libvorbis # libvorbis
 libvpx_vp8 # libvpx
 libvpx_vp9 # libvpx
 mjpeg # mjpegtools
-mpeg1video
-mpeg2video
-#mpeg4
 mp1 # twolame/lame
 mp1float # twolame/lame
 mp2 # twolame
 mp2float # twolame
 mp3 # lame
 mp3float # lame
+mpeg1video
+mpeg2video
+#mpeg4
 opus # libopus
 pam # trivial
 pbm # trivial
@@ -99,6 +99,7 @@ vp8 # libvpx
 vp9 # libvpx
 webp # libwebp
 webvtt # trivial
+wrapped_avframe # passthrough
 xbm # trivial
 xwd # xwd
 y41p # trivial
diff --git a/enable_encoders b/enable_encoders
index 6752889..98ab50c 100644
--- a/enable_encoders
+++ b/enable_encoders
@@ -27,10 +27,10 @@ libvpx_vp9
 libwebp
 libwebp_anim
 mjpeg # mjpegtools
-mpeg1video
-mpeg2video
 mp2 # twolame
 mp2fixed # twolame
+mpeg1video
+mpeg2video
 opus # opus
 pam
 pbm # trivial
@@ -78,6 +78,7 @@ v408 # trivial
 v410 # trivial
 vorbis # libvorbis
 webvtt # trivial
+wrapped_avframe # passthrough
 xbm # (X11)
 xwd # xwd
 y41p # trivial
diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes
index c08d104..2694e42 100644
--- a/ffmpeg-4.changes
+++ b/ffmpeg-4.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Mon May 11 09:40:09 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Throw out v4l2 m2m. This is likely the same case as boo#1041794.
+
+-------------------------------------------------------------------
+Thu Apr 30 18:00:28 UTC 2020 - Matwey Kornilov <matwey.kornilov@gmail.com>
+
+- Enable v4l2 m2m encoders and decoders
+
+-------------------------------------------------------------------
+Wed Apr 29 12:16:11 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Add 0001-avcodec-cbs_jpeg-Check-length-for-SOS.patch
+  [boo#1170767]
+
 -------------------------------------------------------------------
 Fri Mar 31 00:41:22 UTC 2020 - Ismail Dönmez <idonmez@suse.com>
 
diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec
index 6948763..b819067 100644
--- a/ffmpeg-4.spec
+++ b/ffmpeg-4.spec
@@ -118,6 +118,7 @@ Patch6:         ffmpeg-4.2-dlopen-fdk_aac.patch
 Patch7:         ffmpeg4_swscale_replace_illegal_vector_keyword.patch
 Patch8:         ffmpeg4_swscale_fix_altivec_vsx_recent_gcc.patch
 Patch9:         929e5159bc13da374b83f5627879c607acce180b.patch
+Patch10:        0001-avcodec-cbs_jpeg-Check-length-for-SOS.patch
 BuildRequires:  ladspa-devel
 BuildRequires:  libgsm-devel
 BuildRequires:  libmp3lame-devel