From c589dca94bb496baa33ab4269adb655d4cd9cfdf Mon Sep 17 00:00:00 2001
From: trav90 <travawine@protonmail.ch>
Date: Mon, 2 Jan 2017 00:54:39 -0600
Subject: [PATCH] Make "media.ffmpeg.enabled" pref actually disable FFmpeg when
 set to false

---
 dom/media/fmp4/MP4Decoder.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dom/media/fmp4/MP4Decoder.cpp b/dom/media/fmp4/MP4Decoder.cpp
index a53266aec9..6cb5000bde 100644
--- a/dom/media/fmp4/MP4Decoder.cpp
+++ b/dom/media/fmp4/MP4Decoder.cpp
@@ -160,6 +160,9 @@ IsFFmpegAvailable()
 #ifndef MOZ_FFMPEG
   return false;
 #else
+  if (!Preferences::GetBool("media.ffmpeg.enabled", false)) {
+    return false;
+  }
   nsRefPtr<PlatformDecoderModule> m = FFmpegRuntimeLinker::CreateDecoderModule();
   return !!m;
 #endif