diff --git a/media/ffvpx/README_MCP b/media/ffvpx/README_MCP
index f87750c44..e6b817f29 100644
--- a/media/ffvpx/README_MCP
+++ b/media/ffvpx/README_MCP
@@ -41,3 +41,8 @@ Run in the ffmpeg original tree:
 $ for i in `cat $PATH_CENTRAL/media/ffvpx/FILES`; do diff $REV_LASTSYNC HEAD >> patch.diff; done
 Then apply patch.diff on the ffvpx tree.
 Compilation will reveal if any files are missing.
+
+========================
+
+After updating, apply patches:
+flac-alloc-failure.patch fix leak in flac decoder in case of alloc failure
diff --git a/media/ffvpx/flac-alloc-failure.patch b/media/ffvpx/flac-alloc-failure.patch
new file mode 100644
index 000000000..61330f276
--- /dev/null
+++ b/media/ffvpx/flac-alloc-failure.patch
@@ -0,0 +1,25 @@
+diff --git a/media/ffvpx/libavcodec/flacdec.c b/media/ffvpx/libavcodec/flacdec.c
+index 3d41a1af7f..8189d6af53 100644
+--- a/media/ffvpx/libavcodec/flacdec.c
++++ b/media/ffvpx/libavcodec/flacdec.c
+@@ -146,8 +146,10 @@ static int allocate_buffers(FLACContext *s)
+         return buf_size;
+ 
+     av_fast_malloc(&s->decoded_buffer, &s->decoded_buffer_size, buf_size);
+-    if (!s->decoded_buffer)
++    if (!s->decoded_buffer) {
++        memset(s->decoded, 0, sizeof(s->decoded));
+         return AVERROR(ENOMEM);
++    }
+ 
+     ret = av_samples_fill_arrays((uint8_t **)s->decoded, NULL,
+                                  s->decoded_buffer,
+@@ -525,7 +527,7 @@ static int decode_frame(FLACContext *s)
+         fi.samplerate = s->flac_stream_info.samplerate;
+     s->flac_stream_info.samplerate = s->avctx->sample_rate = fi.samplerate;
+ 
+-    if (!s->got_streaminfo) {
++    if (!s->got_streaminfo || !s->decoded_buffer) {
+         ret = allocate_buffers(s);
+         if (ret < 0)
+             return ret;
diff --git a/media/ffvpx/libavcodec/flacdec.c b/media/ffvpx/libavcodec/flacdec.c
index 42546728b..36fe29f65 100644
--- a/media/ffvpx/libavcodec/flacdec.c
+++ b/media/ffvpx/libavcodec/flacdec.c
@@ -146,8 +146,10 @@ static int allocate_buffers(FLACContext *s)
         return buf_size;
 
     av_fast_malloc(&s->decoded_buffer, &s->decoded_buffer_size, buf_size);
-    if (!s->decoded_buffer)
+    if (!s->decoded_buffer) {
+        memset(s->decoded, 0, sizeof(s->decoded));
         return AVERROR(ENOMEM);
+    }
 
     ret = av_samples_fill_arrays((uint8_t **)s->decoded, NULL,
                                  s->decoded_buffer,
@@ -525,7 +527,7 @@ static int decode_frame(FLACContext *s)
         fi.samplerate = s->flac_stream_info.samplerate;
     s->flac_stream_info.samplerate = s->avctx->sample_rate = fi.samplerate;
 
-    if (!s->got_streaminfo) {
+    if (!s->got_streaminfo || !s->decoded_buffer) {
         ret = allocate_buffers(s);
         if (ret < 0)
             return ret;