lavu: move LOCAL_ALIGNED from internal.h to mem_internal.h

That is a more appropriate place for it.

diff --git a/libavcodec/aacps.c b/libavcodec/aacps.c
index 05a6b5afb87bc39e0f1dad89f8ea394bea508965..6c7a33fea89ad42a18957757c6f112e47b5675cc 100644 (file)
--- a/libavcodec/aacps.c
+++ b/libavcodec/aacps.c
@@ -25,6 +25,7 @@
 #include <stdint.h>
 #include "libavutil/common.h"
 #include "libavutil/mathematics.h"
+#include "libavutil/mem_internal.h"
 #include "avcodec.h"
 #include "aacps.h"
 #if USE_FIXED

diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c
index ca4e83ed64b4a95de4cb646b26410afcd076c313..b74cd82ac0b96c9cb9020c7a1b24ea75d9a40a98 100644 (file)
--- a/libavcodec/aacsbr.c
+++ b/libavcodec/aacsbr.c
@@ -38,6 +38,7 @@
 #include "libavutil/internal.h"
 #include "libavutil/libm.h"
 #include "libavutil/avassert.h"
+#include "libavutil/mem_internal.h"
 
 #include <stdint.h>
 #include <float.h>

diff --git a/libavcodec/aarch64/vp9dsp_init_16bpp_aarch64_template.c b/libavcodec/aarch64/vp9dsp_init_16bpp_aarch64_template.c
index 8dcfdeaaf7caf10d18dbdb8752e1aafea06c6526..d2a4e90b3ad89823d4fd63400f88b1106ce28092 100644 (file)
--- a/libavcodec/aarch64/vp9dsp_init_16bpp_aarch64_template.c
+++ b/libavcodec/aarch64/vp9dsp_init_16bpp_aarch64_template.c
@@ -22,6 +22,7 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/internal.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/aarch64/cpu.h"
 #include "vp9dsp_init.h"
 

diff --git a/libavcodec/aarch64/vp9dsp_init_aarch64.c b/libavcodec/aarch64/vp9dsp_init_aarch64.c
index 4c699759fe87f2b9e334bbdf149093137966fcc5..4d1fee62deb95227d45baaa0c71e8db1621fb8c6 100644 (file)
--- a/libavcodec/aarch64/vp9dsp_init_aarch64.c
+++ b/libavcodec/aarch64/vp9dsp_init_aarch64.c
@@ -22,6 +22,7 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/internal.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/aarch64/cpu.h"
 #include "libavcodec/vp9dsp.h"
 #include "vp9dsp_init.h"

diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
index 37dc0fb2ef0dc7e588542a13c7c07824baf27f5f..0afe94a90988e0e3b169abd10748386301fb972f 100644 (file)
--- a/libavcodec/ac3enc.c
+++ b/libavcodec/ac3enc.c
@@ -34,6 +34,7 @@
 #include "libavutil/channel_layout.h"
 #include "libavutil/crc.h"
 #include "libavutil/internal.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"
 #include "avcodec.h"
 #include "internal.h"

diff --git a/libavcodec/ac3enc_template.c b/libavcodec/ac3enc_template.c
index b85fe51ef516d8c7ab6d5707e9fa535ff4a99dce..b74e38aea0a1307000d86ae3f1bd0ebc1b1f2793 100644 (file)
--- a/libavcodec/ac3enc_template.c
+++ b/libavcodec/ac3enc_template.c
@@ -30,6 +30,7 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/internal.h"
+#include "libavutil/mem_internal.h"
 
 #include "audiodsp.h"
 #include "internal.h"

diff --git a/libavcodec/arm/vp9dsp_init_16bpp_arm_template.c b/libavcodec/arm/vp9dsp_init_16bpp_arm_template.c
index 1b0007859d341927d7f5ad7c3a9433aec4e689ba..b0907094c114f38996e132673d97beccbbbc60e1 100644 (file)
--- a/libavcodec/arm/vp9dsp_init_16bpp_arm_template.c
+++ b/libavcodec/arm/vp9dsp_init_16bpp_arm_template.c
@@ -22,6 +22,7 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/internal.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/arm/cpu.h"
 #include "vp9dsp_init.h"
 

diff --git a/libavcodec/arm/vp9dsp_init_arm.c b/libavcodec/arm/vp9dsp_init_arm.c
index cb7f48d5cac2351fba555142acf4c66fd1e3e84d..b3911f7e497a0caad686a5519d41e3926c8a5a92 100644 (file)
--- a/libavcodec/arm/vp9dsp_init_arm.c
+++ b/libavcodec/arm/vp9dsp_init_arm.c
@@ -22,6 +22,7 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/internal.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/arm/cpu.h"
 #include "libavcodec/vp9dsp.h"
 #include "vp9dsp_init.h"

diff --git a/libavcodec/atrac3plusdsp.c b/libavcodec/atrac3plusdsp.c
index 7af1fa21418377610fa29ee78d8028cd45b83cb2..e32c5c81705d5a6d133c0230758346084f7c788d 100644 (file)
--- a/libavcodec/atrac3plusdsp.c
+++ b/libavcodec/atrac3plusdsp.c
@@ -29,6 +29,8 @@
 
 #include "libavutil/float_dsp.h"
 #include "libavutil/libm.h"
+#include "libavutil/mem_internal.h"
+
 #include "avcodec.h"
 #include "sinewin.h"
 #include "fft.h"

diff --git a/libavcodec/bink.c b/libavcodec/bink.c
index ec164d0165218dd56a43cf06dc8d8840ccda6cf4..5efd24e9c3bb9e4e9cb96224d04d327b1a46dd9c 100644 (file)
--- a/libavcodec/bink.c
+++ b/libavcodec/bink.c
@@ -23,6 +23,7 @@
 #include "libavutil/attributes.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
+#include "libavutil/mem_internal.h"
 
 #define BITSTREAM_READER_LE
 #include "avcodec.h"

diff --git a/libavcodec/dca_lbr.c b/libavcodec/dca_lbr.c
index 747fdafd3e4c27284aca6db5b58fcf2f1b6704d9..2f8060df890ca7013e91daef256fccaaf1a7fe7a 100644 (file)
--- a/libavcodec/dca_lbr.c
+++ b/libavcodec/dca_lbr.c
@@ -21,6 +21,7 @@
 #define BITSTREAM_READER_LE
 
 #include "libavutil/channel_layout.h"
+#include "libavutil/mem_internal.h"
 
 #include "dcadec.h"
 #include "dcadata.h"

diff --git a/libavcodec/dcadsp.c b/libavcodec/dcadsp.c
index fade1a6c02cd4093f20d54ed5ec96f3087b50d80..faf244c8adb8d6261bd788ad4f7e071dbd7dd329 100644 (file)
--- a/libavcodec/dcadsp.c
+++ b/libavcodec/dcadsp.c
@@ -19,6 +19,7 @@
  */
 
 #include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 
 #include "dcadsp.h"
 #include "dcamath.h"

diff --git a/libavcodec/dcaenc.c b/libavcodec/dcaenc.c
index 34b3e94165ec236d3688c095fb63c8879eacf827..a40d2e0ca013b7a4340de37871e61f0a77112393 100644 (file)
--- a/libavcodec/dcaenc.c
+++ b/libavcodec/dcaenc.c
@@ -28,6 +28,7 @@
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "libavutil/ffmath.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"
 #include "avcodec.h"
 #include "dca.h"

diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c
index 91eeb47e330d6e9a018ce5c086eec46588f5b374..0144797d1bdfeaf301bf168543987a2c34b7132c 100644 (file)
--- a/libavcodec/dnxhdenc.c
+++ b/libavcodec/dnxhdenc.c
@@ -25,6 +25,7 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/internal.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"
 
 #include "avcodec.h"

diff --git a/libavcodec/dolby_e.c b/libavcodec/dolby_e.c
index 429612ec08f4138ce3e4267be6b07c20330566fb..2b2f0a16407ce9c029c1c1481c2af517263bd782 100644 (file)
--- a/libavcodec/dolby_e.c
+++ b/libavcodec/dolby_e.c
@@ -21,6 +21,7 @@
 #include "libavutil/float_dsp.h"
 #include "libavutil/thread.h"
 #include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 
 #include "internal.h"
 #include "get_bits.h"

diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c
index c526091eb4edc6b3820fb044ee6c2a71a5b75178..a0647e58b46513674e8d460697fc9ed76f301e6d 100644 (file)
--- a/libavcodec/dvdec.c
+++ b/libavcodec/dvdec.c
@@ -38,6 +38,7 @@
 #include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/pixdesc.h"
 
 #include "avcodec.h"

diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c
index 21a8b841f68e97a97167ca210901d0515fb5ec29..0dc290642ebc76a232237b1aa3ff7f4e73195b79 100644 (file)
--- a/libavcodec/dvenc.c
+++ b/libavcodec/dvenc.c
@@ -30,6 +30,7 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/internal.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 

diff --git a/libavcodec/h264_loopfilter.c b/libavcodec/h264_loopfilter.c
index 0924f32613f1f06beaf7881c5c28d49f0cd62ba3..558ec6c02dfb3b1d2e3dfaf59a4b02c5de88112f 100644 (file)
--- a/libavcodec/h264_loopfilter.c
+++ b/libavcodec/h264_loopfilter.c
@@ -27,6 +27,7 @@
 
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 #include "internal.h"
 #include "avcodec.h"
 #include "h264dec.h"

diff --git a/libavcodec/imc.c b/libavcodec/imc.c
index dbcb98a966bc11a72874959fd4997546a5ec0b2d..0f6db8f70883ac1470ba6096dc740714406d388e 100644 (file)
--- a/libavcodec/imc.c
+++ b/libavcodec/imc.c
@@ -38,7 +38,9 @@
 #include "libavutil/ffmath.h"
 #include "libavutil/float_dsp.h"
 #include "libavutil/internal.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/thread.h"
+
 #include "avcodec.h"
 #include "bswapdsp.h"
 #include "get_bits.h"

diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c
index ced7fa52ee316b23941c744110af5ec2c221d858..c9007b2fd646fc58bd28b2631554ba8cb62df432 100644 (file)
--- a/libavcodec/ituh263dec.c
+++ b/libavcodec/ituh263dec.c
@@ -34,6 +34,7 @@
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
+#include "libavutil/mem_internal.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "h263.h"

diff --git a/libavcodec/lpc.c b/libavcodec/lpc.c
index f8da1e12667773cb394297bde8fba41d07959251..1d1d04fd801064a7bb964d0fc0f358e5214af3c4 100644 (file)
--- a/libavcodec/lpc.c
+++ b/libavcodec/lpc.c
@@ -21,6 +21,7 @@
 
 #include "libavutil/common.h"
 #include "libavutil/lls.h"
+#include "libavutil/mem_internal.h"
 
 #define LPC_USE_DOUBLE
 #include "lpc.h"

diff --git a/libavcodec/me_cmp.c b/libavcodec/me_cmp.c
index ae248c52f82a50f811f7908d0b055bf57fc98d98..ba72468240a3bd933edbf3c1cdee75c371871c46 100644 (file)
--- a/libavcodec/me_cmp.c
+++ b/libavcodec/me_cmp.c
@@ -22,6 +22,7 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/internal.h"
+#include "libavutil/mem_internal.h"
 #include "avcodec.h"
 #include "copy_block.h"
 #include "simple_idct.h"

diff --git a/libavcodec/mips/aacsbr_mips.c b/libavcodec/mips/aacsbr_mips.c
index 5ef5e68371b4bc52e88557b8504809d7403fe765..33fd9b229efe288904d8104ba9f9b2a40509bd02 100644 (file)
--- a/libavcodec/mips/aacsbr_mips.c
+++ b/libavcodec/mips/aacsbr_mips.c
@@ -53,6 +53,7 @@
 
 #include "libavcodec/aac.h"
 #include "libavcodec/aacsbr.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/mips/asmdefs.h"
 
 #define ENVELOPE_ADJUSTMENT_OFFSET 2

diff --git a/libavcodec/mips/vc1dsp_mmi.c b/libavcodec/mips/vc1dsp_mmi.c
index 98378683b8e2eaab55b6f554326e00cc4a86f909..79f19a9b395b6b2787aacfc506fe2c7e8d280994 100644 (file)
--- a/libavcodec/mips/vc1dsp_mmi.c
+++ b/libavcodec/mips/vc1dsp_mmi.c
@@ -25,6 +25,7 @@
 #include "constants.h"
 #include "vc1dsp_mips.h"
 #include "hpeldsp_mips.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/mips/mmiutils.h"
 
 #define VC1_INV_TRANCS_8_TYPE1(o1, o2, r1, r2, r3, r4, c0)                  \

diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c
index 720d67623f84c6502bd0355b2bb7741d4554f0e9..af12a6fd8e0d04cfc8989610b813449ce89f0ed8 100644 (file)
--- a/libavcodec/mpc7.c
+++ b/libavcodec/mpc7.c
@@ -28,7 +28,9 @@
 #include "libavutil/channel_layout.h"
 #include "libavutil/internal.h"
 #include "libavutil/lfg.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/thread.h"
+
 #include "avcodec.h"
 #include "get_bits.h"
 #include "internal.h"

diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 243d3ca632046fddcb92c742cf36549c78f18036..25d9004199f999599b804f8b122f3685b6491bd7 100644 (file)
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -36,6 +36,7 @@
 #include "libavutil/internal.h"
 #include "libavutil/intmath.h"
 #include "libavutil/mathematics.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/opt.h"
 #include "avcodec.h"

diff --git a/libavcodec/mpegvideo_motion.c b/libavcodec/mpegvideo_motion.c
index 5624c1062974c64ca739087276074fa70fd78beb..58cdecf83b633354cdb0ac60a23a3d64838a9e23 100644 (file)
--- a/libavcodec/mpegvideo_motion.c
+++ b/libavcodec/mpegvideo_motion.c
@@ -25,6 +25,8 @@
 
 #include "libavutil/avassert.h"
 #include "libavutil/internal.h"
+#include "libavutil/mem_internal.h"
+
 #include "avcodec.h"
 #include "h261.h"
 #include "mpegutils.h"

diff --git a/libavcodec/ppc/mpegaudiodsp_altivec.c b/libavcodec/ppc/mpegaudiodsp_altivec.c
index efa9fd5fed3371dc938c085024b6f3d8f56e0695..6794ed09285ba7c7c6cd799fa5fb74cfd629cf7e 100644 (file)
--- a/libavcodec/ppc/mpegaudiodsp_altivec.c
+++ b/libavcodec/ppc/mpegaudiodsp_altivec.c
@@ -23,6 +23,7 @@
 #include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
 #include "libavutil/internal.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/ppc/cpu.h"
 #include "libavutil/ppc/util_altivec.h"
 #include "libavcodec/mpegaudiodsp.h"

diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c
index 5fd279611520ce80f6d49abd3e1a454809067d3a..136f341c08dba042f1785341ce8f5ee3fb1b48a9 100644 (file)
--- a/libavcodec/proresdec2.c
+++ b/libavcodec/proresdec2.c
@@ -29,6 +29,8 @@
 #define LONG_BITSTREAM_READER
 
 #include "libavutil/internal.h"
+#include "libavutil/mem_internal.h"
+
 #include "avcodec.h"
 #include "get_bits.h"
 #include "idctdsp.h"

diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c
index 8bc13fd576780a432e2c9b6eb6d774fe81bff7de..c34e55f873eaf025ae1a4190e59a361a7018d35d 100644 (file)
--- a/libavcodec/proresenc_anatoliy.c
+++ b/libavcodec/proresenc_anatoliy.c
@@ -27,6 +27,7 @@
  * Known FOURCCs: 'ap4h' (444), 'apch' (HQ), 'apcn' (422), 'apcs' (LT), 'acpo' (Proxy)
  */
 
+#include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"
 #include "avcodec.h"
 #include "dct.h"

diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c
index 64950268744f53e9735d7ee6391394b941c08539..0eb2a661cb85f3873a5dccde9426cbc15df30de2 100644 (file)
--- a/libavcodec/ra288.c
+++ b/libavcodec/ra288.c
@@ -22,6 +22,7 @@
 #include "libavutil/channel_layout.h"
 #include "libavutil/float_dsp.h"
 #include "libavutil/internal.h"
+#include "libavutil/mem_internal.h"
 
 #define BITSTREAM_READER_LE
 #include "avcodec.h"

diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index f8cc837985a59affe93a22e1bab31857f64ff8ce..6434f784d6cee11834f3366ba0ce656a1a29e1af 100644 (file)
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -27,6 +27,7 @@
 #include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/thread.h"
 
 #include "avcodec.h"

diff --git a/libavcodec/speedhq.c b/libavcodec/speedhq.c
index 221a70b3e9f2c3a67968edd08fb523d15ccb91de..759fc6dfc58b0da9d200f6528e35e4bfb2a1a361 100644 (file)
--- a/libavcodec/speedhq.c
+++ b/libavcodec/speedhq.c
@@ -28,6 +28,7 @@
 
 #include "config.h"
 #include "libavutil/attributes.h"
+#include "libavutil/mem_internal.h"
 
 #include "avcodec.h"
 #include "get_bits.h"

diff --git a/libavcodec/tests/dct.c b/libavcodec/tests/dct.c
index 2ca8039c01ae27ce657216cf867aef898535947a..eab39e9468b8c37f7171dbe57064e8512f530c05 100644 (file)
--- a/libavcodec/tests/dct.c
+++ b/libavcodec/tests/dct.c
@@ -38,6 +38,7 @@
 #include "libavutil/common.h"
 #include "libavutil/internal.h"
 #include "libavutil/lfg.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/time.h"
 
 #include "libavcodec/dct.h"

diff --git a/libavcodec/tests/x86/dct.c b/libavcodec/tests/x86/dct.c
index afb03b194be306e74d45951e50d18188f015514c..f5c238efc7298321b3bbd85c3ae1cbb4918ecd18 100644 (file)
--- a/libavcodec/tests/x86/dct.c
+++ b/libavcodec/tests/x86/dct.c
@@ -18,6 +18,8 @@
 
 #include "config.h"
 
+#include "libavutil/mem_internal.h"
+
 #include "libavcodec/x86/fdct.h"
 #include "libavcodec/x86/xvididct.h"
 #include "libavcodec/x86/simple_idct.h"

diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
index d5d133540a660a288cf476ca8d9117551fe6d712..94409697281cc090e6f4b2e93bd444ed935d339f 100644 (file)
--- a/libavcodec/vp8.c
+++ b/libavcodec/vp8.c
@@ -25,6 +25,7 @@
  */
 
 #include "libavutil/imgutils.h"
+#include "libavutil/mem_internal.h"
 
 #include "avcodec.h"
 #include "hwconfig.h"

diff --git a/libavcodec/vp9recon.c b/libavcodec/vp9recon.c
index 9a4e7c7a039621889a607297451c803ba8d647db..e38cf99ec5701eed1014bf2498a7382fee277dfe 100644 (file)
--- a/libavcodec/vp9recon.c
+++ b/libavcodec/vp9recon.c
@@ -22,6 +22,7 @@
  */
 
 #include "libavutil/avassert.h"
+#include "libavutil/mem_internal.h"
 
 #include "avcodec.h"
 #include "internal.h"

diff --git a/libavcodec/x86/cavsdsp.c b/libavcodec/x86/cavsdsp.c
index becb3a4808fd0d4e439fb00d93fe2d6c7fff274b..f974f93fc03118b3fa29e6a030797075dec19b01 100644 (file)
--- a/libavcodec/x86/cavsdsp.c
+++ b/libavcodec/x86/cavsdsp.c
@@ -25,6 +25,7 @@
 #include "libavutil/attributes.h"
 #include "libavutil/common.h"
 #include "libavutil/cpu.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/cavsdsp.h"

diff --git a/libavcodec/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c
index 0d3dbbadb0b89628ae0b6766fb278df8e1236ef6..a2d8a64976b74fd644486d1585dc32eeeeb2d81a 100644 (file)
--- a/libavcodec/x86/h264_qpel.c
+++ b/libavcodec/x86/h264_qpel.c
@@ -21,6 +21,7 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/h264dec.h"

diff --git a/libavcodec/x86/hevcdsp_init.c b/libavcodec/x86/hevcdsp_init.c
index 17cd2332aa0a49341421f2f43f01667e9c595ab0..8a3fa2744b28b30e4cee9368639fdca41fea62e8 100644 (file)
--- a/libavcodec/x86/hevcdsp_init.c
+++ b/libavcodec/x86/hevcdsp_init.c
@@ -22,6 +22,7 @@
 #include "config.h"
 
 #include "libavutil/cpu.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/get_bits.h" /* required for hevcdsp.h GetBitContext */

diff --git a/libavcodec/x86/mpegaudiodsp.c b/libavcodec/x86/mpegaudiodsp.c
index d646c6dbcbf40b4e570726b7176e79fe393f78ca..50692f29cea78b688a6bf800756d8e4e4727d1fd 100644 (file)
--- a/libavcodec/x86/mpegaudiodsp.c
+++ b/libavcodec/x86/mpegaudiodsp.c
@@ -22,6 +22,7 @@
 #include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
 #include "libavutil/internal.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/mpegaudiodsp.h"

diff --git a/libavcodec/x86/mpegvideoenc_template.c b/libavcodec/x86/mpegvideoenc_template.c
index 1201be514bb2b027f4e9bedf58043f5914c002e6..b32b1b0350ced43316a41e9933b3c7c424de6246 100644 (file)
--- a/libavcodec/x86/mpegvideoenc_template.c
+++ b/libavcodec/x86/mpegvideoenc_template.c
@@ -23,6 +23,7 @@
 #include <stdint.h>
 
 #include "libavutil/internal.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/x86/asm.h"
 #include "libavcodec/mpegutils.h"
 #include "libavcodec/mpegvideo.h"

diff --git a/libavcodec/x86/rv40dsp_init.c b/libavcodec/x86/rv40dsp_init.c
index b57a3fc31afc6558a1810074de7aa35a5013abe6..79a617ffbe67b5bcb9be689f00f33f194271ca3f 100644 (file)
--- a/libavcodec/x86/rv40dsp_init.c
+++ b/libavcodec/x86/rv40dsp_init.c
@@ -29,6 +29,7 @@
 #include "libavcodec/rv34dsp.h"
 #include "libavutil/attributes.h"
 #include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/x86/cpu.h"
 #include "hpeldsp.h"
 

diff --git a/libavcodec/x86/vc1dsp_mmx.c b/libavcodec/x86/vc1dsp_mmx.c
index 45c8a68f2967f920d78966afd37d3d3341e6b646..6541dda429b399c370e6a88b2ae65ceb021d61c7 100644 (file)
--- a/libavcodec/x86/vc1dsp_mmx.c
+++ b/libavcodec/x86/vc1dsp_mmx.c
@@ -26,6 +26,7 @@
 
 #include "libavutil/cpu.h"
 #include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/vc1dsp.h"

diff --git a/libavcodec/x86/vp8dsp_init.c b/libavcodec/x86/vp8dsp_init.c
index 397b2518cbaed2fefa467e6b56fec014c1b4acb8..dffa7a2418c009fef8ca8ae39e0a177f1ed09ade 100644 (file)
--- a/libavcodec/x86/vp8dsp_init.c
+++ b/libavcodec/x86/vp8dsp_init.c
@@ -23,6 +23,7 @@
 #include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
 #include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/vp8dsp.h"
 

diff --git a/libavcodec/x86/vp9dsp_init.h b/libavcodec/x86/vp9dsp_init.h
index e410cab3a12b6dbbfa9ebceedabf0ae00b547f54..ebe7ca8ad02572ce31070f10e77bc2de5deafc13 100644 (file)
--- a/libavcodec/x86/vp9dsp_init.h
+++ b/libavcodec/x86/vp9dsp_init.h
@@ -23,6 +23,8 @@
 #ifndef AVCODEC_X86_VP9DSP_INIT_H
 #define AVCODEC_X86_VP9DSP_INIT_H
 
+#include "libavutil/mem_internal.h"
+
 #include "libavcodec/vp9dsp.h"
 
 // hack to force-expand BPC

diff --git a/libavfilter/af_arnndn.c b/libavfilter/af_arnndn.c
index 4551ce2b8318fbc0cce8de376e079dd451e17cf8..bcb99dbfc3a34b3a7fd0edd3a30d7fa766f938c1 100644 (file)
--- a/libavfilter/af_arnndn.c
+++ b/libavfilter/af_arnndn.c
@@ -36,6 +36,7 @@
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/float_dsp.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"
 #include "libavutil/tx.h"
 #include "avfilter.h"

diff --git a/libavutil/internal.h b/libavutil/internal.h
index 12f824d97ab441ee80f76f95b6c44bf757aa8a24..80c5d0632695c2912cfacad7c9c3d4c508c77f34 100644 (file)
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -92,10 +92,6 @@
     type av_##name##_get_##field(const str *s) { return s->field; } \
     void av_##name##_set_##field(str *s, type v) { s->field = v; }
 
-// Some broken preprocessors need a second expansion
-// to be forced to tokenize __VA_ARGS__
-#define E1(x) x
-
 /* Check if the hard coded offset of a struct member still matches reality.
  * Induce a compilation failure if not.
  */
@@ -103,39 +99,6 @@
         int x_##o[offsetof(s, m) == o? 1: -1];         \
     }
 
-#define LOCAL_ALIGNED_A(a, t, v, s, o, ...)             \
-    uint8_t la_##v[sizeof(t s o) + (a)];                \
-    t (*v) o = (void *)FFALIGN((uintptr_t)la_##v, a)
-
-#define LOCAL_ALIGNED_D(a, t, v, s, o, ...)             \
-    DECLARE_ALIGNED(a, t, la_##v) s o;                  \
-    t (*v) o = la_##v
-
-#define LOCAL_ALIGNED(a, t, v, ...) LOCAL_ALIGNED_##a(t, v, __VA_ARGS__)
-
-#if HAVE_LOCAL_ALIGNED
-#   define LOCAL_ALIGNED_4(t, v, ...) E1(LOCAL_ALIGNED_D(4, t, v, __VA_ARGS__,,))
-#else
-#   define LOCAL_ALIGNED_4(t, v, ...) E1(LOCAL_ALIGNED_A(4, t, v, __VA_ARGS__,,))
-#endif
-
-#if HAVE_LOCAL_ALIGNED
-#   define LOCAL_ALIGNED_8(t, v, ...) E1(LOCAL_ALIGNED_D(8, t, v, __VA_ARGS__,,))
-#else
-#   define LOCAL_ALIGNED_8(t, v, ...) E1(LOCAL_ALIGNED_A(8, t, v, __VA_ARGS__,,))
-#endif
-
-#if HAVE_LOCAL_ALIGNED
-#   define LOCAL_ALIGNED_16(t, v, ...) E1(LOCAL_ALIGNED_D(16, t, v, __VA_ARGS__,,))
-#else
-#   define LOCAL_ALIGNED_16(t, v, ...) E1(LOCAL_ALIGNED_A(16, t, v, __VA_ARGS__,,))
-#endif
-
-#if HAVE_LOCAL_ALIGNED
-#   define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_D(32, t, v, __VA_ARGS__,,))
-#else
-#   define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_A(32, t, v, __VA_ARGS__,,))
-#endif
 
 #define FF_ALLOC_TYPED_ARRAY(p, nelem)  (p = av_malloc_array(nelem, sizeof(*p)))
 #define FF_ALLOCZ_TYPED_ARRAY(p, nelem) (p = av_mallocz_array(nelem, sizeof(*p)))

diff --git a/libavutil/mem_internal.h b/libavutil/mem_internal.h
index 6fdbcb016e72b4099493164cda9e8c23cef33507..14f45c657fba62fa885f416c99ae371aa33ab730 100644 (file)
--- a/libavutil/mem_internal.h
+++ b/libavutil/mem_internal.h
@@ -21,9 +21,51 @@
 #ifndef AVUTIL_MEM_INTERNAL_H
 #define AVUTIL_MEM_INTERNAL_H
 
+#include "config.h"
+
+#include <stdint.h>
+
 #include "avassert.h"
 #include "mem.h"
 
+// Some broken preprocessors need a second expansion
+// to be forced to tokenize __VA_ARGS__
+#define E1(x) x
+
+#define LOCAL_ALIGNED_A(a, t, v, s, o, ...)             \
+    uint8_t la_##v[sizeof(t s o) + (a)];                \
+    t (*v) o = (void *)FFALIGN((uintptr_t)la_##v, a)
+
+#define LOCAL_ALIGNED_D(a, t, v, s, o, ...)             \
+    DECLARE_ALIGNED(a, t, la_##v) s o;                  \
+    t (*v) o = la_##v
+
+#define LOCAL_ALIGNED(a, t, v, ...) LOCAL_ALIGNED_##a(t, v, __VA_ARGS__)
+
+#if HAVE_LOCAL_ALIGNED
+#   define LOCAL_ALIGNED_4(t, v, ...) E1(LOCAL_ALIGNED_D(4, t, v, __VA_ARGS__,,))
+#else
+#   define LOCAL_ALIGNED_4(t, v, ...) E1(LOCAL_ALIGNED_A(4, t, v, __VA_ARGS__,,))
+#endif
+
+#if HAVE_LOCAL_ALIGNED
+#   define LOCAL_ALIGNED_8(t, v, ...) E1(LOCAL_ALIGNED_D(8, t, v, __VA_ARGS__,,))
+#else
+#   define LOCAL_ALIGNED_8(t, v, ...) E1(LOCAL_ALIGNED_A(8, t, v, __VA_ARGS__,,))
+#endif
+
+#if HAVE_LOCAL_ALIGNED
+#   define LOCAL_ALIGNED_16(t, v, ...) E1(LOCAL_ALIGNED_D(16, t, v, __VA_ARGS__,,))
+#else
+#   define LOCAL_ALIGNED_16(t, v, ...) E1(LOCAL_ALIGNED_A(16, t, v, __VA_ARGS__,,))
+#endif
+
+#if HAVE_LOCAL_ALIGNED
+#   define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_D(32, t, v, __VA_ARGS__,,))
+#else
+#   define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_A(32, t, v, __VA_ARGS__,,))
+#endif
+
 static inline int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size, int zero_realloc)
 {
     void *val;

diff --git a/libavutil/mips/mmiutils.h b/libavutil/mips/mmiutils.h
index 8f692e86c5a0fc8a7f467899c18cd0913ae05b6b..6a82caa908d9e3a7e165f9d021fc391a1a1bfd8a 100644 (file)
--- a/libavutil/mips/mmiutils.h
+++ b/libavutil/mips/mmiutils.h
@@ -25,6 +25,8 @@
 #define AVUTIL_MIPS_MMIUTILS_H
 
 #include "config.h"
+
+#include "libavutil/mem_internal.h"
 #include "libavutil/mips/asmdefs.h"
 
 #if HAVE_LOONGSON2

diff --git a/libavutil/tests/lls.c b/libavutil/tests/lls.c
index 965b0f458d044b7174866fe92ac3be926dffb6f5..4c14c0c4b40102e57db761e4c2a69cd7d934dd7f 100644 (file)
--- a/libavutil/tests/lls.c
+++ b/libavutil/tests/lls.c
@@ -22,6 +22,7 @@
 #include "libavutil/internal.h"
 #include "libavutil/lfg.h"
 #include "libavutil/lls.h"
+#include "libavutil/mem_internal.h"
 
 int main(void)
 {

diff --git a/libswscale/ppc/swscale_ppc_template.c b/libswscale/ppc/swscale_ppc_template.c
index aff2dd79f9242e6297610624578221019ca0b4af..0ffa92725bc6e5bd2913e699f486f108d72d68f1 100644 (file)
--- a/libswscale/ppc/swscale_ppc_template.c
+++ b/libswscale/ppc/swscale_ppc_template.c
@@ -21,6 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/mem_internal.h"
+
 static void FUNC(yuv2planeX_8_16)(const int16_t *filter, int filterSize,
                                   const int16_t **src, uint8_t *dest,
                                   const uint8_t *dither, int offset, int x)

diff --git a/libswscale/ppc/swscale_vsx.c b/libswscale/ppc/swscale_vsx.c
index af8b0e1fa30aab087c5becf2b998fedb96c678ee..8152ce7f100ddd65aadf584e0ed3dede3438e06b 100644 (file)
--- a/libswscale/ppc/swscale_vsx.c
+++ b/libswscale/ppc/swscale_vsx.c
@@ -28,6 +28,7 @@
 #include "libswscale/swscale_internal.h"
 #include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
+#include "libavutil/mem_internal.h"
 #include "yuv2rgb_altivec.h"
 #include "libavutil/ppc/util_altivec.h"
 

diff --git a/tests/checkasm/aacpsdsp.c b/tests/checkasm/aacpsdsp.c
index 2ceef4341f3541b9c1a43089023cb82be95f334c..359b1e9a00ccd6304cd7f786f069894685671f4b 100644 (file)
--- a/tests/checkasm/aacpsdsp.c
+++ b/tests/checkasm/aacpsdsp.c
@@ -18,6 +18,7 @@
 
 #include "libavcodec/aacpsdsp.h"
 #include "libavutil/intfloat.h"
+#include "libavutil/mem_internal.h"
 
 #include "checkasm.h"
 

diff --git a/tests/checkasm/af_afir.c b/tests/checkasm/af_afir.c
index 8d1f815469b1ba053033bc3a3f4919ebf274741d..b8a845db82d214da3e996a5791afe51832e895c7 100644 (file)
--- a/tests/checkasm/af_afir.c
+++ b/tests/checkasm/af_afir.c
@@ -23,6 +23,7 @@
 
 #include "libavfilter/af_afir.h"
 #include "libavutil/internal.h"
+#include "libavutil/mem_internal.h"
 #include "checkasm.h"
 
 #define LEN 256

diff --git a/tests/checkasm/alacdsp.c b/tests/checkasm/alacdsp.c
index cbf03f82e8aa0662ecc56c93ef6f8df9b75cb01a..b822c725cf0353dfc6130aea1ad285de3d4a0c07 100644 (file)
--- a/tests/checkasm/alacdsp.c
+++ b/tests/checkasm/alacdsp.c
@@ -24,6 +24,7 @@
 #include "libavcodec/mathops.h"
 #include "libavutil/common.h"
 #include "libavutil/internal.h"
+#include "libavutil/mem_internal.h"
 
 #define BUF_SIZE 256
 #define MAX_CHANNELS 2

diff --git a/tests/checkasm/audiodsp.c b/tests/checkasm/audiodsp.c
index 7c4e16e40d5d4bc3a6058bd95437318e0f6714bd..d3a560429941f813609c7afc9bfacb7908103f2e 100644 (file)
--- a/tests/checkasm/audiodsp.c
+++ b/tests/checkasm/audiodsp.c
@@ -25,6 +25,7 @@
 
 #include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 
 #include "checkasm.h"
 

diff --git a/tests/checkasm/blockdsp.c b/tests/checkasm/blockdsp.c
index c753506b3cc73de17903b7eded7cb253bbac3ba3..9e6ce9d7d1429bb54c466013689a2f90820e7f8d 100644 (file)
--- a/tests/checkasm/blockdsp.c
+++ b/tests/checkasm/blockdsp.c
@@ -27,6 +27,7 @@
 #include "libavutil/common.h"
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 
 #define randomize_buffers(size)             \
     do {                                    \

diff --git a/tests/checkasm/bswapdsp.c b/tests/checkasm/bswapdsp.c
index 5f7555037dd1458ba84c78578e627f5f6b6ea97d..d789e90de39979262470c513ff35bc5d252853f2 100644 (file)
--- a/tests/checkasm/bswapdsp.c
+++ b/tests/checkasm/bswapdsp.c
@@ -24,6 +24,7 @@
 #include "libavutil/common.h"
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 
 #define BUF_SIZE 512
 

diff --git a/tests/checkasm/exrdsp.c b/tests/checkasm/exrdsp.c
index 754a079f83450429eb17581ad016c69511690a75..2a5febb9d32503e715ff0e274b4678b37b939a54 100644 (file)
--- a/tests/checkasm/exrdsp.c
+++ b/tests/checkasm/exrdsp.c
@@ -24,6 +24,7 @@
 #include "libavcodec/avcodec.h"
 #include "libavcodec/exrdsp.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 
 #define BUF_SIZE 5120
 #define PADDED_BUF_SIZE BUF_SIZE+AV_INPUT_BUFFER_PADDING_SIZE*2

diff --git a/tests/checkasm/fixed_dsp.c b/tests/checkasm/fixed_dsp.c
index fa11f2e23fdeaa3d40009af16293321c1052ff0d..4e610a148e011036263298b01eaaec3cdda9d693 100644 (file)
--- a/tests/checkasm/fixed_dsp.c
+++ b/tests/checkasm/fixed_dsp.c
@@ -23,6 +23,7 @@
 #include "libavutil/fixed_dsp.h"
 #include "libavutil/internal.h"
 #include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 
 #define BUF_SIZE 256
 

diff --git a/tests/checkasm/flacdsp.c b/tests/checkasm/flacdsp.c
index dccb54d67218ea15d4df3663b42a07c8c5cc305c..6cd8ac50ef22177308761a84bd35ed302d1a236d 100644 (file)
--- a/tests/checkasm/flacdsp.c
+++ b/tests/checkasm/flacdsp.c
@@ -24,6 +24,7 @@
 #include "libavutil/common.h"
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 
 #define BUF_SIZE 256
 #define MAX_CHANNELS 8

diff --git a/tests/checkasm/float_dsp.c b/tests/checkasm/float_dsp.c
index a1616a61a8b547eda85eb231fb8de52e7284a018..1437d8ee970b3714e1cd6204868d76ce800f7197 100644 (file)
--- a/tests/checkasm/float_dsp.c
+++ b/tests/checkasm/float_dsp.c
@@ -23,6 +23,8 @@
 
 #include "libavutil/float_dsp.h"
 #include "libavutil/internal.h"
+#include "libavutil/mem_internal.h"
+
 #include "checkasm.h"
 
 #define LEN 256

diff --git a/tests/checkasm/fmtconvert.c b/tests/checkasm/fmtconvert.c
index 50ad3ca2ea84ba0f820e2984b8c7d0c711dc573c..aef74479f6238927144064875a0a9a51d9125b76 100644 (file)
--- a/tests/checkasm/fmtconvert.c
+++ b/tests/checkasm/fmtconvert.c
@@ -24,6 +24,8 @@
 
 #include "libavutil/internal.h"
 #include "libavutil/common.h"
+#include "libavutil/mem_internal.h"
+
 #include "libavcodec/fmtconvert.h"
 
 #include "checkasm.h"

diff --git a/tests/checkasm/h264dsp.c b/tests/checkasm/h264dsp.c
index 697520574357a661197f05f01f338106caf285cd..73924529570d947b73a1aad64a1ede6768eaa5e9 100644 (file)
--- a/tests/checkasm/h264dsp.c
+++ b/tests/checkasm/h264dsp.c
@@ -26,6 +26,7 @@
 #include "libavutil/common.h"
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 
 static const uint32_t pixel_mask[3] = { 0xffffffff, 0x01ff01ff, 0x03ff03ff };
 static const uint32_t pixel_mask_lf[3] = { 0xff0fff0f, 0x01ff000f, 0x03ff000f };

diff --git a/tests/checkasm/h264pred.c b/tests/checkasm/h264pred.c
index 59dcb2f4279093b290d42a01fb26783fcf55cfa7..a3077f6946e87e7eb0dc7190dbae23e90b5d0349 100644 (file)
--- a/tests/checkasm/h264pred.c
+++ b/tests/checkasm/h264pred.c
@@ -25,6 +25,7 @@
 #include "libavutil/common.h"
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 
 static const int codec_ids[4] = { AV_CODEC_ID_H264, AV_CODEC_ID_VP8, AV_CODEC_ID_RV40, AV_CODEC_ID_SVQ3 };
 

diff --git a/tests/checkasm/h264qpel.c b/tests/checkasm/h264qpel.c
index ba069f1259ef96aa74fcf05f9eb955ed4dd3a6e2..e47d6599294bc3decfd93ce29698ca0803e5f6b6 100644 (file)
--- a/tests/checkasm/h264qpel.c
+++ b/tests/checkasm/h264qpel.c
@@ -24,6 +24,7 @@
 #include "libavutil/common.h"
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 
 static const uint32_t pixel_mask[3] = { 0xffffffff, 0x01ff01ff, 0x03ff03ff };
 

diff --git a/tests/checkasm/hevc_add_res.c b/tests/checkasm/hevc_add_res.c
index 0a3bcbb7065880b56a83be40f112a1c4c3c082a7..0c896adaca396f43493e1f53ca2c0ec20451bbf3 100644 (file)
--- a/tests/checkasm/hevc_add_res.c
+++ b/tests/checkasm/hevc_add_res.c
@@ -21,6 +21,7 @@
 #include <string.h>
 
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 
 #include "libavcodec/hevcdsp.h"
 

diff --git a/tests/checkasm/hevc_idct.c b/tests/checkasm/hevc_idct.c
index c20111c2df9ae3baa6a2f93000c9f5b851df60df..338b8a23e4a98f73b8fbb3ec17dda18e76cee5c9 100644 (file)
--- a/tests/checkasm/hevc_idct.c
+++ b/tests/checkasm/hevc_idct.c
@@ -21,6 +21,7 @@
 #include <string.h>
 
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 
 #include "libavcodec/hevcdsp.h"
 

diff --git a/tests/checkasm/hevc_sao.c b/tests/checkasm/hevc_sao.c
index 8d0cf807746dc17c21c79e88fa9769c97c900ed6..6b750758e204ef954e245fbb6e7c6e80fcf6c2ee 100644 (file)
--- a/tests/checkasm/hevc_sao.c
+++ b/tests/checkasm/hevc_sao.c
@@ -21,6 +21,7 @@
 #include <string.h>
 
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 
 #include "libavcodec/avcodec.h"
 

diff --git a/tests/checkasm/jpeg2000dsp.c b/tests/checkasm/jpeg2000dsp.c
index bce534dbaf6c5eedc5e7a8a63ce637402590c72c..c9158ab3de282bf62ad4324b553240ae0144c6e8 100644 (file)
--- a/tests/checkasm/jpeg2000dsp.c
+++ b/tests/checkasm/jpeg2000dsp.c
@@ -23,6 +23,7 @@
 #include "libavutil/common.h"
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 
 #define BUF_SIZE 512
 

diff --git a/tests/checkasm/llviddspenc.c b/tests/checkasm/llviddspenc.c
index 31eafd5526d1a31f0505340408090f2073ad4293..132f6d2771132437f1caf9114194cf8b897b34da 100644 (file)
--- a/tests/checkasm/llviddspenc.c
+++ b/tests/checkasm/llviddspenc.c
@@ -23,6 +23,7 @@
 #include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 
 #include "libavcodec/lossless_videoencdsp.h"
 

diff --git a/tests/checkasm/opusdsp.c b/tests/checkasm/opusdsp.c
index 828ecf9ce2bb2bf193eb7580e22a67d10b5a4744..34ee5a4edc3106304c4d0fcf74d4f5f68bcb1b3e 100644 (file)
--- a/tests/checkasm/opusdsp.c
+++ b/tests/checkasm/opusdsp.c
@@ -16,6 +16,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "libavutil/mem_internal.h"
+
 #include "libavcodec/opusdsp.h"
 
 #include "checkasm.h"

diff --git a/tests/checkasm/pixblockdsp.c b/tests/checkasm/pixblockdsp.c
index 79ab156d45dec150c5f6bb810baed8f8f95dd769..9a7865aa5f8c8e32af00cd216a47b6df1aa24691 100644 (file)
--- a/tests/checkasm/pixblockdsp.c
+++ b/tests/checkasm/pixblockdsp.c
@@ -24,6 +24,7 @@
 #include "libavutil/common.h"
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 
 #define BUF_UNITS 8
 #define BUF_SIZE (BUF_UNITS * 128 + 8 * BUF_UNITS)

diff --git a/tests/checkasm/sbrdsp.c b/tests/checkasm/sbrdsp.c
index 516b9f0ec6fa7db3180366bfa1debe63fd3d0706..2fb14d5bf85a43a145f21badb2be96e7658c3625 100644 (file)
--- a/tests/checkasm/sbrdsp.c
+++ b/tests/checkasm/sbrdsp.c
@@ -16,6 +16,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "libavutil/mem_internal.h"
+
 #include "libavcodec/sbrdsp.h"
 #include <float.h>
 

diff --git a/tests/checkasm/sw_rgb.c b/tests/checkasm/sw_rgb.c
index e5aad20c6dac268fe91872753351456e3095962d..c29b75d09b81f881ad383fdc185342a8cf5076af 100644 (file)
--- a/tests/checkasm/sw_rgb.c
+++ b/tests/checkasm/sw_rgb.c
@@ -22,6 +22,7 @@
 #include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 
 #include "libswscale/rgb2rgb.h"
 

diff --git a/tests/checkasm/sw_scale.c b/tests/checkasm/sw_scale.c
index 9efa2b4defca4db1597b896c185a7bcd7ff4e2d6..8741b3943c2165e5e9488de05550faf756bd8f57 100644 (file)
--- a/tests/checkasm/sw_scale.c
+++ b/tests/checkasm/sw_scale.c
@@ -22,6 +22,7 @@
 #include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 
 #include "libswscale/swscale.h"
 #include "libswscale/swscale_internal.h"

diff --git a/tests/checkasm/synth_filter.c b/tests/checkasm/synth_filter.c
index 87e32ebc0ee21b2a668d726c4e01b3b02541ccce..9a0d746c968651c72347ee2feb030667fc10067f 100644 (file)
--- a/tests/checkasm/synth_filter.c
+++ b/tests/checkasm/synth_filter.c
@@ -25,6 +25,8 @@
 
 #include "libavutil/internal.h"
 #include "libavutil/intfloat.h"
+#include "libavutil/mem_internal.h"
+
 #include "libavcodec/dcadata.h"
 #include "libavcodec/synth_filter.h"
 

diff --git a/tests/checkasm/utvideodsp.c b/tests/checkasm/utvideodsp.c
index 080b4287d73f8caa5e6620233fde94043e6c4a26..bdede6107bb73f20ecde616b0f8eb966ddbacdc4 100644 (file)
--- a/tests/checkasm/utvideodsp.c
+++ b/tests/checkasm/utvideodsp.c
@@ -24,6 +24,7 @@
 #include "libavcodec/avcodec.h"
 #include "libavcodec/utvideodsp.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 
 #define WIDTH 240
 #define HEIGHT 120

diff --git a/tests/checkasm/v210enc.c b/tests/checkasm/v210enc.c
index ed3677659db7e891d425c7e49299ab26770531b0..c3d5cc51454566483ea38e4ff0198a52cf0fce24 100644 (file)
--- a/tests/checkasm/v210enc.c
+++ b/tests/checkasm/v210enc.c
@@ -24,6 +24,7 @@
 #include "libavutil/common.h"
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 
 #define BUF_SIZE 512
 

diff --git a/tests/checkasm/vf_colorspace.c b/tests/checkasm/vf_colorspace.c
index 10b7b83924f3c2617258163132ed84c0d214e27f..31efa671f9ac896a457067202d5d8d15fc9f5862 100644 (file)
--- a/tests/checkasm/vf_colorspace.c
+++ b/tests/checkasm/vf_colorspace.c
@@ -24,6 +24,7 @@
 #include "libavutil/common.h"
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 
 #define W 64
 #define H 64

diff --git a/tests/checkasm/vf_eq.c b/tests/checkasm/vf_eq.c
index 48dccddf779601a57fb6a7957381bdca736c7987..1315b08f0ecd321290d066dd064ba00bd1b2e5d0 100644 (file)
--- a/tests/checkasm/vf_eq.c
+++ b/tests/checkasm/vf_eq.c
@@ -21,6 +21,7 @@
 #include "libavfilter/avfilter.h"
 #include "libavfilter/vf_eq.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 
 #define WIDTH 256
 #define HEIGHT 256

diff --git a/tests/checkasm/vf_hflip.c b/tests/checkasm/vf_hflip.c
index 2d6fdeca7b39f1db189ccee4d1d40731b75a5275..a3b6e613d5e0e856335f62171921970cf612c207 100644 (file)
--- a/tests/checkasm/vf_hflip.c
+++ b/tests/checkasm/vf_hflip.c
@@ -20,6 +20,7 @@
 #include "checkasm.h"
 #include "libavfilter/hflip.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 
 #define WIDTH 256
 #define WIDTH_PADDED 256 + 32

diff --git a/tests/checkasm/vf_threshold.c b/tests/checkasm/vf_threshold.c
index 5a2fc0e4ee4f8802f3e070f713971671b06c7180..2c5cc807ee61b2515616659efeb4bb578dc66764 100644 (file)
--- a/tests/checkasm/vf_threshold.c
+++ b/tests/checkasm/vf_threshold.c
@@ -20,6 +20,7 @@
 #include "checkasm.h"
 #include "libavfilter/threshold.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 
 #define WIDTH 256
 #define WIDTH_PADDED 256 + 32

diff --git a/tests/checkasm/videodsp.c b/tests/checkasm/videodsp.c
index 0a4424a28cd3f1f0ade23c5cc34dccd180b2fa4f..eb2845a7d928e387f68aa7476560bc1f614cd7e3 100644 (file)
--- a/tests/checkasm/videodsp.c
+++ b/tests/checkasm/videodsp.c
@@ -23,6 +23,7 @@
 #include "libavcodec/videodsp.h"
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 
 #define randomize_buffers(w, h)                         \
     do {                                                \

diff --git a/tests/checkasm/vp8dsp.c b/tests/checkasm/vp8dsp.c
index d93f73087f0550829017129f064cd5f43a47afcf..c3af54fbfd4e3465c292219c6794775a3754a36a 100644 (file)
--- a/tests/checkasm/vp8dsp.c
+++ b/tests/checkasm/vp8dsp.c
@@ -25,6 +25,7 @@
 
 #include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 
 #include "checkasm.h"
 

diff --git a/tests/checkasm/vp9dsp.c b/tests/checkasm/vp9dsp.c
index a91577b94ed005705c81aa45a4ea404fc6f674ed..99c023899f16e9ecce6bb769f5954b7105717aac 100644 (file)
--- a/tests/checkasm/vp9dsp.c
+++ b/tests/checkasm/vp9dsp.c
@@ -27,6 +27,7 @@
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"
+#include "libavutil/mem_internal.h"
 
 static const uint32_t pixel_mask[3] = { 0xffffffff, 0x03ff03ff, 0x0fff0fff };
 #define SIZEOF_PIXEL ((bit_depth + 7) / 8)