Backed out changeset 1f5356e9679e (bug 1240630)

configure.in

@@ -3741,7 +3741,7 @@ if test -n "$MOZ_FMP4"; then
 else
   MOZ_FMP4=
 fi
-MOZ_FFMPEG=
+MOZ_FFMPEG=1
 MOZ_WEBRTC=1
 MOZ_PEERCONNECTION=
 MOZ_SRTP=
@@ -5229,14 +5229,6 @@ fi;
 dnl ========================================================
 dnl FFmpeg H264/AAC Decoding Support
 dnl ========================================================
-case "$OS_TARGET" in
-WINNT|Android)
-    ;;
-*)
-    MOZ_FFMPEG=1
-    ;;
-esac
-
 MOZ_ARG_DISABLE_BOOL(ffmpeg,
 [  --disable-ffmpeg         Disable FFmpeg for fragmented H264/AAC decoding],
     MOZ_FFMPEG=,

dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp

@@ -44,6 +44,7 @@ PRLibrary* FFmpegRuntimeLinker::sLinkedLib = nullptr;
 PRLibrary* FFmpegRuntimeLinker::sLinkedUtilLib = nullptr;
 static unsigned (*avcodec_version)() = nullptr;
 
+#if !defined(XP_WIN)
 #ifdef __GNUC__
 #define AV_FUNC(func, ver) void (*func)();
 #define LIBAVCODEC_ALLVERSION
@@ -52,6 +53,7 @@ static unsigned (*avcodec_version)() = nullptr;
 #endif
 #include "FFmpegFunctionList.h"
 #undef AV_FUNC
+#endif
 
 static PRLibrary*
 MozAVLink(const char* aName)
@@ -68,6 +70,7 @@ FFmpegRuntimeLinker::Link()
   if (sLinkStatus) {
     return sLinkStatus == LinkStatus_SUCCEEDED;
   }
+#if !defined(XP_WIN)
   MOZ_ASSERT(NS_IsMainThread());
 
   for (size_t i = 0; i < ArrayLength(sLibs); i++) {
@@ -91,6 +94,7 @@ FFmpegRuntimeLinker::Link()
   FFMPEG_LOG(" ]\n");
 
   Unlink();
+#endif
 
   sLinkStatus = LinkStatus_FAILED;
   return false;
@@ -99,6 +103,9 @@ FFmpegRuntimeLinker::Link()
 /* static */ bool
 FFmpegRuntimeLinker::Bind(const char* aLibName)
 {
+#if defined(XP_WIN)
+  return false;
+#else
   avcodec_version = (decltype(avcodec_version))PR_FindSymbol(sLinkedLib,
                                                            "avcodec_version");
   uint32_t major, minor, micro;
@@ -145,11 +152,15 @@ FFmpegRuntimeLinker::Bind(const char* aLibName)
 #include "FFmpegFunctionList.h"
 #undef AV_FUNC
   return true;
+#endif
 }
 
 /* static */ already_AddRefed<PlatformDecoderModule>
 FFmpegRuntimeLinker::CreateDecoderModule()
 {
+#if defined(XP_WIN)
+  return nullptr;
+#else
   if (!Link()) {
     return nullptr;
   }
@@ -168,6 +179,7 @@ FFmpegRuntimeLinker::CreateDecoderModule()
     default: module = nullptr;
   }
   return module.forget();
+#endif
 }
 
 /* static */ void

dom/media/platforms/ffmpeg/ffmpeg57/moz.build

@@ -21,5 +21,9 @@ if CONFIG['CLANG_CXX']:
   CXXFLAGS += [
     '-Wno-unknown-attributes',
   ]
+if CONFIG['_MSC_VER']:
+  CXXFLAGS += [
+    '-wd4996', # deprecated declaration
+  ]
 
 FINAL_LIBRARY = 'xul'

dom/media/platforms/ffmpeg/libav55/moz.build

@@ -21,5 +21,9 @@ if CONFIG['CLANG_CXX']:
   CXXFLAGS += [
     '-Wno-unknown-attributes',
   ]
+if CONFIG['_MSC_VER']:
+  CXXFLAGS += [
+    '-wd4996', # deprecated declaration
+  ]
 
 FINAL_LIBRARY = 'xul'

dom/media/platforms/moz.build

@@ -38,11 +38,6 @@ if CONFIG['MOZ_WMF']:
 if CONFIG['MOZ_EME']:
     DIRS += ['agnostic/eme']
 
-if CONFIG['MOZ_FFVPX']:
-    DIRS += [
-        'ffmpeg/ffvpx',
-    ]
-
 if CONFIG['MOZ_FFMPEG']:
     EXPORTS += [
         'ffmpeg/FFmpegRuntimeLinker.h',
@@ -50,12 +45,17 @@ if CONFIG['MOZ_FFMPEG']:
     UNIFIED_SOURCES += [
         'ffmpeg/FFmpegRuntimeLinker.cpp',
     ]
-    DIRS += [
-        'ffmpeg/libav53',
-        'ffmpeg/libav54',
-        'ffmpeg/libav55',
-        'ffmpeg/ffmpeg57',
-    ]
+    if CONFIG['MOZ_FFVPX']:
+        DIRS += [
+            'ffmpeg/ffvpx',
+        ]
+    if CONFIG['OS_ARCH'] != 'WINNT':
+        DIRS += [
+            'ffmpeg/libav53',
+            'ffmpeg/libav54',
+            'ffmpeg/libav55',
+            'ffmpeg/ffmpeg57',
+        ]
 
 if CONFIG['MOZ_APPLEMEDIA']:
   EXPORTS += [