--- a/media/ffvpx/config_flac.h
+++ b/media/ffvpx/config_flac.h
@@ -1,12 +1,12 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--disable-everything --disable-protocols --disable-demuxers --disable-muxers --disable-filters --disable-programs --disable-doc --disable-parsers --disable-static --enable-shared --disable-debug --disable-sdl2 --disable-libxcb --disable-securetransport --disable-iconv --disable-swresample --disable-swscale --disable-avdevice --disable-avfilter --disable-avformat --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-videotoolbox --enable-decoder=flac --disable-asm"
+#define FFMPEG_CONFIGURATION "--disable-everything --disable-protocols --disable-demuxers --disable-muxers --disable-filters --disable-programs --disable-doc --disable-parsers --disable-static --enable-shared --disable-debug --disable-sdl2 --disable-libxcb --disable-securetransport --disable-iconv --disable-swresample --disable-swscale --disable-avdevice --disable-avfilter --disable-avformat --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-videotoolbox --enable-decoder=flac --disable-vdpau --disable-crystalhd --disable-asm"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define CONFIG_THIS_YEAR 2017
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
 #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
 #define CC_IDENT "gcc 7 (Ubuntu 7.2.0-8ubuntu3)"
 #define av_restrict restrict
 #define EXTERN_PREFIX ""
 #define EXTERN_ASM
@@ -167,17 +167,17 @@
 #define HAVE_MIPSDSP_INLINE 0
 #define HAVE_MIPSDSPR2_INLINE 0
 #define HAVE_MSA_INLINE 0
 #define HAVE_LOONGSON2_INLINE 0
 #define HAVE_LOONGSON3_INLINE 0
 #define HAVE_MMI_INLINE 0
 #define HAVE_ALIGNED_STACK 0
 #define HAVE_FAST_64BIT 0
-#define HAVE_FAST_CLZ 1
+#define HAVE_FAST_CLZ 0
 #define HAVE_FAST_CMOV 0
 #define HAVE_LOCAL_ALIGNED_8 1
 #define HAVE_LOCAL_ALIGNED_16 1
 #define HAVE_LOCAL_ALIGNED_32 1
 #define HAVE_SIMD_ALIGN_16 0
 #define HAVE_SIMD_ALIGN_32 0
 #define HAVE_ATOMICS_GCC 1
 #define HAVE_ATOMICS_SUNCC 0
@@ -376,17 +376,17 @@
 #define HAVE_PERL 1
 #define HAVE_POD2MAN 1
 #define HAVE_SECTION_DATA_REL_RO 1
 #define HAVE_TEXI2HTML 0
 #define HAVE_THREADS 1
 #define HAVE_UWP 0
 #define HAVE_VAAPI_DRM 0
 #define HAVE_VAAPI_X11 0
-#define HAVE_VDPAU_X11 1
+#define HAVE_VDPAU_X11 0
 #define HAVE_WINRT 0
 #define CONFIG_DOC 0
 #define CONFIG_HTMLPAGES 1
 #define CONFIG_MANPAGES 1
 #define CONFIG_PODPAGES 1
 #define CONFIG_TXTPAGES 1
 #define CONFIG_AVIO_DIR_CMD_EXAMPLE 1
 #define CONFIG_AVIO_READING_EXAMPLE 1

--- a/media/ffvpx/config_win32.asm
+++ b/media/ffvpx/config_win32.asm
@@ -151,17 +151,17 @@
 %define HAVE_MIPSDSP_INLINE 0
 %define HAVE_MIPSDSPR2_INLINE 0
 %define HAVE_MSA_INLINE 0
 %define HAVE_LOONGSON2_INLINE 0
 %define HAVE_LOONGSON3_INLINE 0
 %define HAVE_MMI_INLINE 0
 %define HAVE_ALIGNED_STACK 0
 %define HAVE_FAST_64BIT 0
-%define HAVE_FAST_CLZ 1
+%define HAVE_FAST_CLZ 0
 %define HAVE_FAST_CMOV 0
 %define HAVE_LOCAL_ALIGNED_8 1
 %define HAVE_LOCAL_ALIGNED_16 1
 %define HAVE_LOCAL_ALIGNED_32 1
 %define HAVE_SIMD_ALIGN_16 1
 %define HAVE_ATOMICS_GCC 0
 %define HAVE_ATOMICS_SUNCC 0
 %define HAVE_ATOMICS_WIN32 1

--- a/media/ffvpx/config_win32.h
+++ b/media/ffvpx/config_win32.h
@@ -167,17 +167,17 @@
 #define HAVE_MIPSDSP_INLINE 0
 #define HAVE_MIPSDSPR2_INLINE 0
 #define HAVE_MSA_INLINE 0
 #define HAVE_LOONGSON2_INLINE 0
 #define HAVE_LOONGSON3_INLINE 0
 #define HAVE_MMI_INLINE 0
 #define HAVE_ALIGNED_STACK 0
 #define HAVE_FAST_64BIT 0
-#define HAVE_FAST_CLZ 1
+#define HAVE_FAST_CLZ 0
 #define HAVE_FAST_CMOV 0
 #define HAVE_LOCAL_ALIGNED_8 1
 #define HAVE_LOCAL_ALIGNED_16 1
 #define HAVE_LOCAL_ALIGNED_32 1
 #define HAVE_SIMD_ALIGN_16 1
 #define HAVE_ATOMICS_GCC 0
 #define HAVE_ATOMICS_SUNCC 0
 #define HAVE_ATOMICS_WIN32 1

--- a/media/ffvpx/config_win64.asm
+++ b/media/ffvpx/config_win64.asm
@@ -151,17 +151,17 @@
 %define HAVE_MIPSDSP_INLINE 0
 %define HAVE_MIPSDSPR2_INLINE 0
 %define HAVE_MSA_INLINE 0
 %define HAVE_LOONGSON2_INLINE 0
 %define HAVE_LOONGSON3_INLINE 0
 %define HAVE_MMI_INLINE 0
 %define HAVE_ALIGNED_STACK 1
 %define HAVE_FAST_64BIT 1
-%define HAVE_FAST_CLZ 1
+%define HAVE_FAST_CLZ 0
 %define HAVE_FAST_CMOV 1
 %define HAVE_LOCAL_ALIGNED_8 1
 %define HAVE_LOCAL_ALIGNED_16 1
 %define HAVE_LOCAL_ALIGNED_32 1
 %define HAVE_SIMD_ALIGN_16 1
 %define HAVE_ATOMICS_GCC 0
 %define HAVE_ATOMICS_SUNCC 0
 %define HAVE_ATOMICS_WIN32 1

--- a/media/ffvpx/config_win64.h
+++ b/media/ffvpx/config_win64.h
@@ -167,17 +167,17 @@
 #define HAVE_MIPSDSP_INLINE 0
 #define HAVE_MIPSDSPR2_INLINE 0
 #define HAVE_MSA_INLINE 0
 #define HAVE_LOONGSON2_INLINE 0
 #define HAVE_LOONGSON3_INLINE 0
 #define HAVE_MMI_INLINE 0
 #define HAVE_ALIGNED_STACK 1
 #define HAVE_FAST_64BIT 1
-#define HAVE_FAST_CLZ 1
+#define HAVE_FAST_CLZ 0
 #define HAVE_FAST_CMOV 1
 #define HAVE_LOCAL_ALIGNED_8 1
 #define HAVE_LOCAL_ALIGNED_16 1
 #define HAVE_LOCAL_ALIGNED_32 1
 #define HAVE_SIMD_ALIGN_16 1
 #define HAVE_ATOMICS_GCC 0
 #define HAVE_ATOMICS_SUNCC 0
 #define HAVE_ATOMICS_WIN32 1

--- a/media/ffvpx/libavcodec/moz.build
+++ b/media/ffvpx/libavcodec/moz.build
@@ -17,16 +17,17 @@ SOURCES += [
     'bsf.c',
     'codec_desc.c',
     'decode.c',
     'dummy_funcs.c',
     'flac.c',
     'flacdata.c',
     'flacdec.c',
     'flacdsp.c',
+    'log2_tab.c',
     'null_bsf.c',
     'options.c',
     'parser.c',
     'pthread.c',
     'pthread_frame.c',
     'pthread_slice.c',
     'utils.c',
     'vorbis_parser.c',
@@ -37,17 +38,16 @@ if not CONFIG['MOZ_FFVPX_FLACONLY']:
     SOURCES += [
         'audioconvert.c',
         'avpicture.c',
         'bitstream.c',
         'bitstream_filter.c',
         'golomb.c',
         'h264pred.c',
         'imgconvert.c',
-        'log2_tab.c',
         'mathtables.c',
         'profiles.c',
         'qsv_api.c',
         'raw.c',
         'resample.c',
         'resample2.c',
         'reverse.c',
         'videodsp.c',

--- a/media/ffvpx/libavutil/moz.build
+++ b/media/ffvpx/libavutil/moz.build
@@ -23,16 +23,17 @@ SOURCES += [
     'error.c',
     'eval.c',
     'fifo.c',
     'fixed_dsp.c',
     'float_dsp.c',
     'frame.c',
     'imgutils.c',
     'log.c',
+    'log2_tab.c',
     'mathematics.c',
     'mem.c',
     'opt.c',
     'parseutils.c',
     'pixdesc.c',
     'rational.c',
     'reverse.c',
     'samplefmt.c',