[fmp4] Disable fmp4

sailfishos · May 13, 2015 · a30b4e1 · a30b4e1
1 parent 8e4b9d0
commit a30b4e1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/embedding/embedlite/config/mozconfig.merqtxulrunner b/embedding/embedlite/config/mozconfig.merqtxulrunner
@@ -39,6 +39,7 @@ ac_add_options --enable-gstreamer
 ac_add_options --disable-dbus
 ac_add_options --disable-necko-wifi
 ac_add_options --disable-elf-hack
+ac_add_options --disable-fmp4
 
 ac_add_options --disable-accessibility
 ac_add_options --without-x
diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp
@@ -100,8 +100,10 @@
 #endif
 
 #ifdef MOZ_FFMPEG
+#ifdef MOZ_FMP4
 #include "FFmpegRuntimeLinker.h"
 #endif
+#endif
 
 #include "CubebUtils.h"
 #include "Latency.h"
@@ -378,7 +380,9 @@ nsLayoutStatics::Shutdown()
 #endif
 
 #ifdef MOZ_FFMPEG
+#ifdef MOZ_FMP4
   FFmpegRuntimeLinker::Unlink();
+#endif
 #endif
 
   CubebUtils::ShutdownLibrary();