diff options
| author | Michael Forney <mforney@mforney.org> | 2021-10-25 17:10:28 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2021-10-25 17:10:44 -0700 |
| commit | f8b20538cc063224c6a1a2a8a65fbaa5e87c3f3c (patch) | |
| tree | dfdef309bc9b48f17c3e0aec1d1acd2189c4314e /pkg | |
| parent | 0397356c5cd05aec2d9eced54c62c31e4af5c840 (diff) | |
ffmpeg: Use C11 _Alignas if available
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/ffmpeg/patch/0007-libavutil-Use-C11-_Alignas-as-fallback-for-DECLARE_A.patch | 27 | ||||
| -rw-r--r-- | pkg/ffmpeg/patch/0008-HACK-Disable-__has_builtin-for-now.patch (renamed from pkg/ffmpeg/patch/0007-HACK-Disable-__has_builtin-for-now.patch) | 0 | ||||
| -rw-r--r-- | pkg/ffmpeg/ver | 2 |
3 files changed, 28 insertions, 1 deletions
diff --git a/pkg/ffmpeg/patch/0007-libavutil-Use-C11-_Alignas-as-fallback-for-DECLARE_A.patch b/pkg/ffmpeg/patch/0007-libavutil-Use-C11-_Alignas-as-fallback-for-DECLARE_A.patch new file mode 100644 index 00000000..77930f03 --- /dev/null +++ b/pkg/ffmpeg/patch/0007-libavutil-Use-C11-_Alignas-as-fallback-for-DECLARE_A.patch @@ -0,0 +1,27 @@ +From 998e73fa83da20afd47263fce2e50876c799ee41 Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Mon, 25 Oct 2021 17:08:29 -0700 +Subject: [PATCH] libavutil: Use C11 _Alignas as fallback for DECLARE_ALIGNED + +--- + libavutil/mem.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/libavutil/mem.h b/libavutil/mem.h +index e21a1feaae..aeaacd9d55 100644 +--- a/libavutil/mem.h ++++ b/libavutil/mem.h +@@ -121,6 +121,10 @@ + #define DECLARE_ALIGNED(n,t,v) __declspec(align(n)) t v + #define DECLARE_ASM_ALIGNED(n,t,v) __declspec(align(n)) t v + #define DECLARE_ASM_CONST(n,t,v) __declspec(align(n)) static const t v ++#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L ++ #define DECLARE_ALIGNED(n,t,v) _Alignas(n) t v ++ #define DECLARE_ASM_ALIGNED(n,t,v) _Alignas(n) t v ++ #define DECLARE_ASM_CONST(n,t,v) static const _Alignas(n) t v + #else + #define DECLARE_ALIGNED(n,t,v) t v + #define DECLARE_ASM_ALIGNED(n,t,v) t v +-- +2.32.0 + diff --git a/pkg/ffmpeg/patch/0007-HACK-Disable-__has_builtin-for-now.patch b/pkg/ffmpeg/patch/0008-HACK-Disable-__has_builtin-for-now.patch index 4a2f042e..4a2f042e 100644 --- a/pkg/ffmpeg/patch/0007-HACK-Disable-__has_builtin-for-now.patch +++ b/pkg/ffmpeg/patch/0008-HACK-Disable-__has_builtin-for-now.patch diff --git a/pkg/ffmpeg/ver b/pkg/ffmpeg/ver index 38252e97..13a939b6 100644 --- a/pkg/ffmpeg/ver +++ b/pkg/ffmpeg/ver @@ -1 +1 @@ -4.4 r1 +4.4 r2 |