Bug 1874684 - Part 28: Return DateDuration from DifferenceISODateTime. r=mgaudet
[gecko.git] / media / ffvpx / changes.patch
blobaf2aa208494064efb7aefd0e3589af0114fe6971
1 diff --git a/media/ffvpx/libavutil/eval.c b/media/ffvpx/libavutil/eval.c
2 index 7642b91..e938bd5 100644
3 --- a/media/ffvpx/libavutil/eval.c
4 +++ b/media/ffvpx/libavutil/eval.c
5 @@ -34,7 +34,7 @@
6 #include "internal.h"
7 #include "log.h"
8 #include "mathematics.h"
9 -#include "time.h"
10 +#include "fftime.h"
11 #include "avstring.h"
12 #include "timer.h"
14 diff --git a/media/ffvpx/libavutil/time.c b/media/ffvpx/libavutil/time.c
15 index dbaee02..69419e6 100644
16 --- a/media/ffvpx/libavutil/time.c
17 +++ b/media/ffvpx/libavutil/time.c
18 @@ -33,7 +33,7 @@
19 #include <windows.h>
20 #endif
22 -#include "time.h"
23 +#include "fftime.h"
24 #include "error.h"
26 int64_t av_gettime(void)
27 diff --git a/media/ffvpx/libavutil/parseutils.c b/media/ffvpx/libavutil/parseutils.c
28 index 9fb8d0a..97ad3b9 100644
29 --- a/media/ffvpx/libavutil/parseutils.c
30 +++ b/media/ffvpx/libavutil/parseutils.c
31 @@ -28,7 +28,7 @@
32 #include "common.h"
33 #include "eval.h"
34 #include "log.h"
35 -#include "random_seed.h"
36 +/* #include "random_seed.h" */
37 #include "time_internal.h"
38 #include "parseutils.h"
40 @@ -367,7 +367,7 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen,
41 rgba_color[3] = 255;
43 if (!av_strcasecmp(color_string2, "random") || !av_strcasecmp(color_string2, "bikeshed")) {
44 - int rgba = av_get_random_seed();
45 + int rgba = 0xffffffff; /* av_get_random_seed(); */
46 rgba_color[0] = rgba >> 24;
47 rgba_color[1] = rgba >> 16;
48 rgba_color[2] = rgba >> 8;
49 diff -up media/ffvpx/libavutil/fftime.h media/ffvpx/libavutil/fftime.h
50 --- media/ffvpx/libavutil/fftime.h 2021-12-06 14:51:40.378642713 +0100
51 +++ media/ffvpx/libavutil/fftime.h 2021-12-06 14:51:54.618098212 +0100
52 @@ -22,6 +22,7 @@
53 #define AVUTIL_TIME_H
55 #include <stdint.h>
56 +#include <time.h>
58 /**
59 * Get the current time in microseconds.
61 diff --git a/media/ffvpx/compat/w32pthreads.h b/media/ffvpx/compat/w32pthreads.h
62 --- a/media/ffvpx/compat/w32pthreads.h
63 +++ b/media/ffvpx/compat/w32pthreads.h
64 @@ -39,17 +39,17 @@
65 #include <windows.h>
66 #include <process.h>
67 #include <time.h>
69 #include "libavutil/attributes.h"
70 #include "libavutil/common.h"
71 #include "libavutil/internal.h"
72 #include "libavutil/mem.h"
73 -#include "libavutil/time.h"
74 +#include "libavutil/fftime.h"
76 typedef struct pthread_t {
77 void *handle;
78 void *(*func)(void* arg);
79 void *arg;
80 void *ret;
81 } pthread_t;