From 43a97878ce14b72f0981164f87f2e35e14151312 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sun, 7 Apr 2024 11:22:09 +0200
Subject: Adding upstream version 110.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 media/ffvpx/changes.patch | 105 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 media/ffvpx/changes.patch

(limited to 'media/ffvpx/changes.patch')

diff --git a/media/ffvpx/changes.patch b/media/ffvpx/changes.patch
new file mode 100644
index 0000000000..da7561f254
--- /dev/null
+++ b/media/ffvpx/changes.patch
@@ -0,0 +1,105 @@
+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.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 {
+diff -up media/ffvpx/libavutil/fftime.h media/ffvpx/libavutil/fftime.h
+--- media/ffvpx/libavutil/fftime.h	2021-12-06 14:51:40.378642713 +0100
++++ media/ffvpx/libavutil/fftime.h	2021-12-06 14:51:54.618098212 +0100
+@@ -22,6 +22,7 @@
+ #define AVUTIL_TIME_H
+ 
+ #include <stdint.h>
++#include <time.h>
+ 
+ /**
+  * Get the current time in microseconds.
+  *
+diff --git a/media/ffvpx/compat/w32pthreads.h b/media/ffvpx/compat/w32pthreads.h
+--- a/media/ffvpx/compat/w32pthreads.h
++++ b/media/ffvpx/compat/w32pthreads.h
+@@ -39,17 +39,17 @@
+ #include <windows.h>
+ #include <process.h>
+ #include <time.h>
+ 
+ #include "libavutil/attributes.h"
+ #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;
+     void *(*func)(void* arg);
+     void *arg;
+     void *ret;
+ } pthread_t;
+ 
-- 
cgit v1.2.3