From 9a7fdfb2bf20cdd47b56209c6cf20193e8fb5d32 Mon Sep 17 00:00:00 2001
From: Kyle Huey <khuey@kylehuey.com>
Date: Wed, 6 Oct 2010 16:17:54 -0400
Subject: [PATCH] Bug 600540: Disable raw video by default. r=cpearce a=beltzer

--HG--
extra : rebase_source : 0ddea9a76805d6d8da3328c368c8393111ab7790
---
 configure.in                                        | 10 +++++-----
 layout/build/Makefile.in                            |  2 ++
 uriloader/exthandler/nsExternalHelperAppService.cpp |  2 ++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/configure.in b/configure.in
index cab5fb8ead5..7853e292f56 100644
--- a/configure.in
+++ b/configure.in
@@ -5899,12 +5899,12 @@ if test -n "$MOZ_NO_FAST_LOAD"; then
 fi
 
 dnl ========================================================
-dnl = Disable Raw Codecs
+dnl = Enable Raw Codecs
 dnl ========================================================
-MOZ_ARG_DISABLE_BOOL(raw,
-[  --disable-raw           Disable support for RAW media],
-    MOZ_RAW=,
-    MOZ_RAW=1)
+MOZ_ARG_ENABLE_BOOL(raw,
+[  --enable-raw           Enable support for RAW media],
+    MOZ_RAW=1,
+    MOZ_RAW=)
 
 if test -n "$MOZ_RAW"; then
     AC_DEFINE(MOZ_RAW)
diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in
index 4bf16935a45..b92312502d8 100644
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -177,9 +177,11 @@ SHARED_LIBRARY_LIBS 	+= \
 	$(NULL)
 endif
 
+ifdef MOZ_RAW
 SHARED_LIBRARY_LIBS     += \
        $(DEPTH)/content/media/raw/$(LIB_PREFIX)gkconraw_s.$(LIB_SUFFIX)\
        $(NULL)
+endif
 
 ifdef MOZ_WEBM
 SHARED_LIBRARY_LIBS 	+= \
diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp
index 5e0268c7346..bb5da29e0a5 100644
--- a/uriloader/exthandler/nsExternalHelperAppService.cpp
+++ b/uriloader/exthandler/nsExternalHelperAppService.cpp
@@ -585,7 +585,9 @@ static nsExtraMimeTypeEntry extraMimeEntries [] =
   { VIDEO_WEBM, "webm", "Web Media Video" },
   { AUDIO_WEBM, "webm", "Web Media Audio" },
 #endif
+#ifdef MOZ_RAW
   { VIDEO_RAW, "yuv", "Raw YUV Video" },
+#endif
   { AUDIO_WAV, "wav", "Waveform Audio" },
 };