Bug 941298 - Build changes for FFmpeg PlatformDecoderModule r=gps

configure.in

@@ -3948,6 +3948,7 @@ MOZ_GSTREAMER=
 MOZ_DIRECTSHOW=
 MOZ_WMF=
 MOZ_FMP4=
+MOZ_FFMPEG=
 MOZ_WEBRTC=1
 MOZ_PEERCONNECTION=
 MOZ_SRTP=
@@ -5266,10 +5267,27 @@ if test -n "$MOZ_WMF"; then
     AC_DEFINE(MOZ_WMF)
 fi;
 
+dnl ========================================================
+dnl FFmpeg H264/AAC Decoding Support
+dnl ========================================================
+if test "$OS_TARGET" = "Linux"; then
+  MOZ_FFMPEG=1
+fi
+
+MOZ_ARG_DISABLE_BOOL(ffmpeg,
+[  --disable-ffmpeg         Disable FFmpeg for fragmented H264/AAC decoding],
+    MOZ_FFMPEG=,
+    MOZ_FFMPEG=1
+)
+
+if test -n "$MOZ_FFMPEG"; then
+    AC_DEFINE(MOZ_FFMPEG)
+fi;
+
 dnl ========================================================
 dnl = Built-in fragmented MP4 support.
 dnl ========================================================
-if test -n "$MOZ_WMF"; then
+if test -n "$MOZ_WMF" -o -n "$MOZ_FFMPEG"; then
     dnl Enable fragmented MP4 parser on Windows by default.
     dnl We will also need to enable it on other platforms as we implement
     dnl platform decoder support there too.
@@ -8693,6 +8711,7 @@ AC_SUBST(MOZ_TREMOR)
 AC_SUBST(MOZ_OPUS)
 AC_SUBST(MOZ_WEBM)
 AC_SUBST(MOZ_WMF)
+AC_SUBST(MOZ_FFMPEG)
 AC_SUBST(MOZ_FMP4)
 AC_SUBST(MOZ_DIRECTSHOW)
 AC_SUBST(MOZ_MEDIA_PLUGINS)

content/media/fmp4/moz.build

@@ -67,6 +67,26 @@ if CONFIG['MOZ_WMF']:
       'wmf/WMFVideoOutputSource.cpp',
   ]
 
+if CONFIG['MOZ_FFMPEG']:
+  EXPORTS += [
+      'ffmpeg/FFmpegAACDecoder.h',
+      'ffmpeg/FFmpegDataDecoder.h',
+      'ffmpeg/FFmpegDecoderModule.h',
+      'ffmpeg/FFmpegFunctionList.h',
+      'ffmpeg/FFmpegH264Decoder.h',
+      'ffmpeg/FFmpegRuntimeLinker.h',
+  ]
+  UNIFIED_SOURCES += [
+      'ffmpeg/FFmpegAACDecoder.cpp',
+      'ffmpeg/FFmpegDataDecoder.cpp',
+      'ffmpeg/FFmpegDecoderModule.cpp',
+      'ffmpeg/FFmpegH264Decoder.cpp',
+      'ffmpeg/FFmpegRuntimeLinker.cpp',
+  ]
+  LOCAL_INCLUDES += [
+      'ffmpeg/include',
+  ]
+
 FINAL_LIBRARY = 'gklayout'
 
 FAIL_ON_WARNINGS = True