From 9f5bb3f714712a6cf14b97cfd4d403b1f0a0b720 Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Wed, 18 Nov 2015 19:25:08 -0800
Subject: [PATCH] Back out changeset 1d431c8667a3 (bug 1209388) for breaking
 test_can_play_type_mpeg.html (and thus, probably, the playing of audio) on OS
 X 10.6 CLOSED TREE

---
 modules/libpref/init/all.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 3210ffd256a..50b4eef2f4c 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -352,9 +352,13 @@ pref("media.webm.intel_decoder.enabled", true);
 pref("media.gstreamer.enabled", true);
 pref("media.gstreamer.enable-blacklist", true);
 #endif
-#if defined(MOZ_APPLEMEDIA) && defined(MOZ_WIDGET_UIKIT)
+#ifdef MOZ_APPLEMEDIA
+#ifdef MOZ_WIDGET_UIKIT
 pref("media.mp3.enabled", true);
 #endif
+pref("media.apple.mp3.enabled", true);
+pref("media.apple.mp4.enabled", true);
+#endif
 #ifdef MOZ_WEBRTC
 pref("media.navigator.enabled", true);
 pref("media.navigator.video.enabled", true);