Bug 1796532 - Re-apply in-tree patch over vendored ffmpeg. r=alwu

Depends on D161163

Differential Revision: https://phabricator.services.mozilla.com/D161164

media/ffvpx/compat/w32pthreads.h

@@ -44,7 +44,7 @@
 #include "libavutil/common.h"
 #include "libavutil/internal.h"
 #include "libavutil/mem.h"
-#include "libavutil/time.h"
+#include "libavutil/fftime.h"
 
 typedef struct pthread_t {
     void *handle;

media/ffvpx/libavutil/eval.c

@@ -35,7 +35,7 @@
 #include "internal.h"
 #include "log.h"
 #include "mathematics.h"
-#include "time.h"
+#include "fftime.h"
 #include "avstring.h"
 #include "timer.h"
 #include "reverse.h"

media/ffvpx/libavutil/fftime.h

@@ -22,6 +22,7 @@
 #define AVUTIL_TIME_H
 
 #include <stdint.h>
+#include <time.h>
 
 /**
  * Get the current time in microseconds.

media/ffvpx/libavutil/hwcontext_vaapi.c

@@ -44,7 +44,9 @@
 #include "buffer.h"
 #include "common.h"
 #include "hwcontext.h"
+#if CONFIG_LIBDRM
 #include "hwcontext_drm.h"
+#endif
 #include "hwcontext_internal.h"
 #include "hwcontext_vaapi.h"
 #include "mem.h"

media/ffvpx/libavutil/parseutils.c

@@ -28,10 +28,10 @@
 #include "common.h"
 #include "eval.h"
 #include "log.h"
-#include "random_seed.h"
+/* #include "random_seed.h" */
 #include "time_internal.h"
 #include "parseutils.h"
-#include "time.h"
+#include "fftime.h"
 
 #ifdef TEST
 
@@ -375,7 +375,7 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen,
     rgba_color[3] = 255;
 
     if (!av_strcasecmp(color_string2, "random") || !av_strcasecmp(color_string2, "bikeshed")) {
-        int rgba = av_get_random_seed();
+        int rgba = 0xffffffff; /* av_get_random_seed(); */
         rgba_color[0] = rgba >> 24;
         rgba_color[1] = rgba >> 16;
         rgba_color[2] = rgba >> 8;

media/ffvpx/libavutil/time.c

@@ -33,7 +33,7 @@
 #include <windows.h>
 #endif
 
-#include "time.h"
+#include "fftime.h"
 #include "error.h"
 
 int64_t av_gettime(void)