changes.patch (3232B)
1 --- a/libavutil/time.c 2024-02-14 14:57:10.389087159 +0100 2 +++ b/libavutil/time.c 2024-04-05 14:43:19.097889433 +0200 3 @@ -28,17 +28,17 @@ 4 #endif 5 #if HAVE_UNISTD_H 6 #include <unistd.h> 7 #endif 8 #if HAVE_WINDOWS_H 9 #include <windows.h> 10 #endif 11 12 -#include "time.h" 13 +#include "fftime.h" 14 #include "error.h" 15 16 int64_t av_gettime(void) 17 { 18 #if HAVE_GETTIMEOFDAY 19 struct timeval tv; 20 gettimeofday(&tv, NULL); 21 return (int64_t)tv.tv_sec * 1000000 + tv.tv_usec; 22 --- a/libavutil/parseutils.c 2024-03-26 14:03:12.080640731 +0100 23 +++ b/libavutil/parseutils.c 2024-04-05 14:44:56.508766832 +0200 24 @@ -23,20 +23,20 @@ 25 26 #include <time.h> 27 28 #include "avstring.h" 29 #include "avutil.h" 30 #include "common.h" 31 #include "eval.h" 32 #include "log.h" 33 -#include "random_seed.h" 34 +/* #include "random_seed.h" */ 35 #include "time_internal.h" 36 #include "parseutils.h" 37 -#include "time.h" 38 +#include "fftime.h" 39 40 #ifdef TEST 41 42 #define av_get_random_seed av_get_random_seed_deterministic 43 static uint32_t av_get_random_seed_deterministic(void); 44 45 #define av_gettime() 1331972053200000 46 47 @@ -370,17 +370,17 @@ 48 av_strlcpy(color_string2, color_string + hex_offset, 49 FFMIN(slen-hex_offset+1, sizeof(color_string2))); 50 if ((tail = strchr(color_string2, ALPHA_SEP))) 51 *tail++ = 0; 52 len = strlen(color_string2); 53 rgba_color[3] = 255; 54 55 if (!av_strcasecmp(color_string2, "random") || !av_strcasecmp(color_string2, "bikeshed")) { 56 - int rgba = av_get_random_seed(); 57 + int rgba = 0xffffffff; /* av_get_random_seed(); */ 58 rgba_color[0] = rgba >> 24; 59 rgba_color[1] = rgba >> 16; 60 rgba_color[2] = rgba >> 8; 61 rgba_color[3] = rgba; 62 } else if (hex_offset || 63 strspn(color_string2, "0123456789ABCDEFabcdef") == len) { 64 char *tail; 65 unsigned int rgba = strtoul(color_string2, &tail, 16); 66 --- a/libavutil/eval.c 2024-04-05 14:40:56.917791496 +0200 67 +++ b/libavutil/eval.c 2024-04-05 17:39:45.061516936 +0200 68 @@ -31,17 +31,17 @@ 69 #include "avutil.h" 70 #include "common.h" 71 #include "eval.h" 72 #include "ffmath.h" 73 #include "log.h" 74 #include "mathematics.h" 75 #include "mem.h" 76 #include "sfc64.h" 77 -#include "time.h" 78 +#include "fftime.h" 79 #include "avstring.h" 80 #include "reverse.h" 81 82 typedef struct Parser { 83 const AVClass *class; 84 int stack_index; 85 char *s; 86 const double *const_values; 87 --- a/media/ffvpx/libavcodec/dxva2.c 88 +++ b/media/ffvpx/libavcodec/dxva2.c 89 @@ -27,7 +27,7 @@ 90 #include "libavutil/common.h" 91 #include "libavutil/log.h" 92 #include "libavutil/mem.h" 93 -#include "libavutil/time.h" 94 +#include "libavutil/fftime.h" 95 96 #include "avcodec.h" 97 #include "decode.h" 98 --- a/media/ffvpx/libavcodec/dxva2_internal.h 99 +++ b/media/ffvpx/libavcodec/dxva2_internal.h 100 @@ -65,6 +65,7 @@ 101 #endif 102 103 #include "libavutil/hwcontext.h" 104 +#include "libavutil/mem.h" 105 106 #include "avcodec.h" 107 #include "internal.h" 108 --- a/media/ffvpx/libavcodec/dxva2.c 109 +++ b/media/ffvpx/libavcodec/dxva2.c 110 @@ -647,6 +647,7 @@ int ff_dxva2_common_frame_params(AVCodec 111 AVD3D11VAFramesContext *frames_hwctx = frames_ctx->hwctx; 112 113 frames_hwctx->BindFlags |= D3D11_BIND_DECODER; 114 + frames_hwctx->BindFlags |= D3D11_BIND_SHADER_RESOURCE; 115 } 116 #endif