diff options
| author | Anton Khirnov <anton@khirnov.net> | 2020-05-27 14:54:38 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2021-01-01 14:14:57 +0100 |
| commit | e15371061d23457554d241a80dc471515ac13ad4 (patch) | |
| tree | 02400adf5d8667fed6f416c954ea41c055f8ef5c /libswscale | |
| parent | c8c2dfbc378e54aee7e8181ff532483096dc4bc7 (diff) | |
| download | ffmpeg-e15371061d23457554d241a80dc471515ac13ad4.tar.gz | |
lavu/mem: move the DECLARE_ALIGNED macro family to mem_internal on next+1 bump
They are not properly namespaced and not intended for public use.
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/output.c | 1 | ||||
| -rw-r--r-- | libswscale/ppc/yuv2rgb_altivec.c | 1 | ||||
| -rw-r--r-- | libswscale/swscale.c | 1 | ||||
| -rw-r--r-- | libswscale/swscale_internal.h | 1 | ||||
| -rw-r--r-- | libswscale/swscale_unscaled.c | 1 | ||||
| -rw-r--r-- | libswscale/x86/hscale_fast_bilinear_simd.c | 1 | ||||
| -rw-r--r-- | libswscale/x86/rgb2rgb.c | 2 | ||||
| -rw-r--r-- | libswscale/x86/swscale.c | 1 |
8 files changed, 9 insertions, 0 deletions
diff --git a/libswscale/output.c b/libswscale/output.c index 4ef436e7e4..e855ad606a 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -30,6 +30,7 @@ #include "libavutil/cpu.h" #include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" +#include "libavutil/mem_internal.h" #include "libavutil/pixdesc.h" #include "config.h" #include "rgb2rgb.h" diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c index 536545293d..58e480dd2c 100644 --- a/libswscale/ppc/yuv2rgb_altivec.c +++ b/libswscale/ppc/yuv2rgb_altivec.c @@ -96,6 +96,7 @@ #include "libswscale/swscale_internal.h" #include "libavutil/attributes.h" #include "libavutil/cpu.h" +#include "libavutil/mem_internal.h" #include "libavutil/pixdesc.h" #include "yuv2rgb_altivec.h" diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 9cb7e8f6ac..12160a169a 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -30,6 +30,7 @@ #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" +#include "libavutil/mem_internal.h" #include "libavutil/pixdesc.h" #include "config.h" #include "rgb2rgb.h" diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index d207d3beff..a1de95cee0 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -29,6 +29,7 @@ #include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "libavutil/log.h" +#include "libavutil/mem_internal.h" #include "libavutil/pixfmt.h" #include "libavutil/pixdesc.h" #include "libavutil/ppc/util_altivec.h" diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 7e92f3fafc..c4dd8a4d83 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -30,6 +30,7 @@ #include "libavutil/cpu.h" #include "libavutil/avutil.h" #include "libavutil/mathematics.h" +#include "libavutil/mem_internal.h" #include "libavutil/bswap.h" #include "libavutil/pixdesc.h" #include "libavutil/avassert.h" diff --git a/libswscale/x86/hscale_fast_bilinear_simd.c b/libswscale/x86/hscale_fast_bilinear_simd.c index 60a2cbfc50..850f0add31 100644 --- a/libswscale/x86/hscale_fast_bilinear_simd.c +++ b/libswscale/x86/hscale_fast_bilinear_simd.c @@ -21,6 +21,7 @@ #include "../swscale_internal.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" +#include "libavutil/mem_internal.h" #define RET 0xC3 // near return opcode for x86 #define PREFETCH "prefetchnta" diff --git a/libswscale/x86/rgb2rgb.c b/libswscale/x86/rgb2rgb.c index 2d6fc2ad26..4344b5f714 100644 --- a/libswscale/x86/rgb2rgb.c +++ b/libswscale/x86/rgb2rgb.c @@ -30,6 +30,8 @@ #include "libavutil/x86/cpu.h" #include "libavutil/cpu.h" #include "libavutil/bswap.h" +#include "libavutil/mem_internal.h" + #include "libswscale/rgb2rgb.h" #include "libswscale/swscale.h" #include "libswscale/swscale_internal.h" diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index 3160fedf04..15c0b22f20 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -27,6 +27,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/x86/cpu.h" #include "libavutil/cpu.h" +#include "libavutil/mem_internal.h" #include "libavutil/pixdesc.h" const DECLARE_ALIGNED(8, uint64_t, ff_dither4)[2] = { |