зеркало из https://github.com/mozilla/gecko-dev.git
77 строки
2.2 KiB
Diff
77 строки
2.2 KiB
Diff
diff --git a/media/ffvpx/libavutil/eval.c b/media/ffvpx/libavutil/eval.c
|
|
index 7642b91..e938bd5 100644
|
|
--- a/media/ffvpx/libavutil/eval.c
|
|
+++ b/media/ffvpx/libavutil/eval.c
|
|
@@ -34,7 +34,7 @@
|
|
#include "internal.h"
|
|
#include "log.h"
|
|
#include "mathematics.h"
|
|
-#include "time.h"
|
|
+#include "fftime.h"
|
|
#include "avstring.h"
|
|
#include "timer.h"
|
|
|
|
diff --git a/media/ffvpx/libavutil/time.h b/media/ffvpx/libavutil/fftime.h
|
|
similarity index 100%
|
|
rename from media/ffvpx/libavutil/time.h
|
|
rename to media/ffvpx/libavutil/fftime.h
|
|
diff --git a/media/ffvpx/libavutil/time.c b/media/ffvpx/libavutil/time.c
|
|
index dbaee02..69419e6 100644
|
|
--- a/media/ffvpx/libavutil/time.c
|
|
+++ b/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)
|
|
diff --git a/media/ffvpx/libavutil/parseutils.c b/media/ffvpx/libavutil/parseutils.c
|
|
index 9fb8d0a..97ad3b9 100644
|
|
--- a/media/ffvpx/libavutil/parseutils.c
|
|
+++ b/media/ffvpx/libavutil/parseutils.c
|
|
@@ -28,7 +28,7 @@
|
|
#include "common.h"
|
|
#include "eval.h"
|
|
#include "log.h"
|
|
-#include "random_seed.h"
|
|
+/* #include "random_seed.h" */
|
|
#include "time_internal.h"
|
|
#include "parseutils.h"
|
|
|
|
@@ -367,7 +367,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;
|
|
diff --git a/media/ffvpx/libavutil/hwcontext_vaapi.c b/media/ffvpx/libavutil/hwcontext_vaapi.c
|
|
--- a/media/ffvpx/libavutil/hwcontext_vaapi.c
|
|
+++ b/media/ffvpx/libavutil/hwcontext_vaapi.c
|
|
@@ -39,17 +39,19 @@
|
|
# include <unistd.h>
|
|
#endif
|
|
|
|
|
|
#include "avassert.h"
|
|
#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"
|
|
#include "pixdesc.h"
|
|
#include "pixfmt.h"
|
|
|
|
|
|
typedef struct VAAPIDevicePriv {
|
|
|