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.

diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index 336c651d3172963f6f574cc10b163fda35f258ee..4d58b093f76f0b3ce8b5e45759d377e6457628a8 100644 (file)
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -30,6 +30,7 @@
 #include "libavutil/frame.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 #include "avcodec.h"
 #include "blockdsp.h"
 #include "bswapdsp.h"

diff --git a/libavcodec/aac.h b/libavcodec/aac.h
index d422ea5b139660c38455a4414b0cdf57d54c15df..1e82f56ca95ad234ba298d5f54c390ee0a165125 100644 (file)
--- a/libavcodec/aac.h
+++ b/libavcodec/aac.h
@@ -34,6 +34,7 @@
 #include "aac_defines.h"
 #include "libavutil/float_dsp.h"
 #include "libavutil/fixed_dsp.h"
+#include "libavutil/mem_internal.h"
 #include "avcodec.h"
 #if !USE_FIXED
 #include "mdct15.h"

diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h
index 5a015ca92e30723408a0fd1fe73be8a8f8cf7245..8ffc94f99ba8b8773da48e2098782c76ed77e99a 100644 (file)
--- a/libavcodec/aacenc.h
+++ b/libavcodec/aacenc.h
@@ -23,6 +23,8 @@
 #define AVCODEC_AACENC_H
 
 #include "libavutil/float_dsp.h"
+#include "libavutil/mem_internal.h"
+
 #include "avcodec.h"
 #include "put_bits.h"
 

diff --git a/libavcodec/aacps.h b/libavcodec/aacps.h
index 4f6d2ad7dd6c79cefb69121529fc33a8cec99878..3efa38ad889a31c94086efc84927f9461bb306da 100644 (file)
--- a/libavcodec/aacps.h
+++ b/libavcodec/aacps.h
@@ -24,6 +24,8 @@
 
 #include <stdint.h>
 
+#include "libavutil/mem_internal.h"
+
 #include "aacpsdsp.h"
 #include "avcodec.h"
 #include "get_bits.h"

diff --git a/libavcodec/aacps_fixed_tablegen.h b/libavcodec/aacps_fixed_tablegen.h
index 8b82deb59672e6564949a71c27bcd28dd7bf4812..356fb8b293aa528157a625abdbcf6412ade8660a 100644 (file)
--- a/libavcodec/aacps_fixed_tablegen.h
+++ b/libavcodec/aacps_fixed_tablegen.h
@@ -37,6 +37,7 @@
 #include "libavutil/common.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 
 #include "aac_defines.h"
 #include "libavutil/softfloat.h"

diff --git a/libavcodec/aacsbrdata.h b/libavcodec/aacsbrdata.h
index bba50db9bd9f89dba012ef31dd7991f95667451b..7a11594c9bba7d417aeb19e044046fda8f5221df 100644 (file)
--- a/libavcodec/aacsbrdata.h
+++ b/libavcodec/aacsbrdata.h
@@ -29,7 +29,7 @@
 #define AVCODEC_AACSBRDATA_H
 
 #include <stdint.h>
-#include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 #include "aac_defines.h"
 
 ///< Huffman tables for SBR

diff --git a/libavcodec/aactab.c b/libavcodec/aactab.c
index abe5fd756706c4057eee31a523e391523dfbc3ad..fa5420fec6b7a042a86fab65bfff0221e31c09e7 100644 (file)
--- a/libavcodec/aactab.c
+++ b/libavcodec/aactab.c
@@ -29,6 +29,7 @@
 
 #include "config.h"
 #include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/thread.h"
 #include "aac.h"
 #include "aactab.h"

diff --git a/libavcodec/aactab.h b/libavcodec/aactab.h
index 8a354e818624b3b1ccaef3c5468f08ee36004755..9b1450c2ebdf2f54cc9ca258bf4fb71d8caa212c 100644 (file)
--- a/libavcodec/aactab.h
+++ b/libavcodec/aactab.h
@@ -30,7 +30,7 @@
 #ifndef AVCODEC_AACTAB_H
 #define AVCODEC_AACTAB_H
 
-#include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 #include "aac.h"
 
 #include <stdint.h>

diff --git a/libavcodec/ac3dec.h b/libavcodec/ac3dec.h
index ce1434b55c9d9d03f91446916dc6e7da70465149..85653990cfa33769af201c63aa79f5d2e1198ff3 100644 (file)
--- a/libavcodec/ac3dec.h
+++ b/libavcodec/ac3dec.h
@@ -53,6 +53,8 @@
 #include "libavutil/float_dsp.h"
 #include "libavutil/fixed_dsp.h"
 #include "libavutil/lfg.h"
+#include "libavutil/mem_internal.h"
+
 #include "ac3.h"
 #include "ac3dsp.h"
 #include "bswapdsp.h"

diff --git a/libavcodec/ac3dsp.c b/libavcodec/ac3dsp.c
index 43438da1314ca229956dd312500ef3269bb4b30e..382f87c05f3b94068e4ae18aa8e7a6b2d915d89b 100644 (file)
--- a/libavcodec/ac3dsp.c
+++ b/libavcodec/ac3dsp.c
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/mem_internal.h"
+
 #include "avcodec.h"
 #include "ac3.h"
 #include "ac3dsp.h"

diff --git a/libavcodec/ac3tab.c b/libavcodec/ac3tab.c
index ef2a41bc59fd152745bada4101127e085380fffd..d018110331d388560f414f8c97310d39641c4713 100644 (file)
--- a/libavcodec/ac3tab.c
+++ b/libavcodec/ac3tab.c
@@ -25,7 +25,7 @@
  */
 
 #include "libavutil/channel_layout.h"
-#include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 
 #include "avcodec.h"
 #include "ac3tab.h"

diff --git a/libavcodec/agm.c b/libavcodec/agm.c
index f60cbf1a187499c3efc8cf4c24688a68e0ddc5cf..f39383140fdb7b4c52105cec52c3b499ee9702e5 100644 (file)
--- a/libavcodec/agm.c
+++ b/libavcodec/agm.c
@@ -26,6 +26,8 @@
 
 #define BITSTREAM_READER_LE
 
+#include "libavutil/mem_internal.h"
+
 #include "avcodec.h"
 #include "bytestream.h"
 #include "copy_block.h"

diff --git a/libavcodec/aic.c b/libavcodec/aic.c
index f027fa99ef9b6505254f83cdeaa08f8539a4a64c..cf5b0782bebcaa3a401c580799546f918f9d4766 100644 (file)
--- a/libavcodec/aic.c
+++ b/libavcodec/aic.c
@@ -22,6 +22,8 @@
 
 #include <inttypes.h>
 
+#include "libavutil/mem_internal.h"
+
 #include "avcodec.h"
 #include "bytestream.h"
 #include "internal.h"

diff --git a/libavcodec/arm/sbcdsp_init_arm.c b/libavcodec/arm/sbcdsp_init_arm.c
index 6bf7e729ef118c5ca7f1331831f56a513f07584c..b8fa5a35aba7bf8dd0fa24687b4f124e234519f2 100644 (file)
--- a/libavcodec/arm/sbcdsp_init_arm.c
+++ b/libavcodec/arm/sbcdsp_init_arm.c
@@ -30,6 +30,7 @@
  */
 
 #include "libavutil/cpu.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/arm/cpu.h"
 #include "libavcodec/sbcdsp.h"
 

diff --git a/libavcodec/asv.h b/libavcodec/asv.h
index e778c72d340b7bcf891891f64b951348e3e13e71..269bbe7c18e1fde6bdf72b0f0e66420542725600 100644 (file)
--- a/libavcodec/asv.h
+++ b/libavcodec/asv.h
@@ -28,7 +28,7 @@
 
 #include <stdint.h>
 
-#include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 
 #include "avcodec.h"
 #include "blockdsp.h"

diff --git a/libavcodec/atrac1.c b/libavcodec/atrac1.c
index 0dd8b87bf562e3e5561ac28c61c561885a0d2c4c..54f9b1c2d8633bb534ffbff7baf6993bb17f17e3 100644 (file)
--- a/libavcodec/atrac1.c
+++ b/libavcodec/atrac1.c
@@ -33,6 +33,8 @@
 #include <stdio.h>
 
 #include "libavutil/float_dsp.h"
+#include "libavutil/mem_internal.h"
+
 #include "avcodec.h"
 #include "get_bits.h"
 #include "fft.h"

diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c
index 633032786fa9e9c9ec6fc9f83531f8e97460b132..37ccbcc946cbc394cbb426a09cc6776f8db107bf 100644 (file)
--- a/libavcodec/atrac3.c
+++ b/libavcodec/atrac3.c
@@ -39,6 +39,7 @@
 #include "libavutil/attributes.h"
 #include "libavutil/float_dsp.h"
 #include "libavutil/libm.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/thread.h"
 
 #include "avcodec.h"

diff --git a/libavcodec/atrac3plus.h b/libavcodec/atrac3plus.h
index 82fe0fe1f8741beccff2d341083d82452e0f2031..a588436e2adb86fb32e27b22ec7f96d9fca09038 100644 (file)
--- a/libavcodec/atrac3plus.h
+++ b/libavcodec/atrac3plus.h
@@ -31,6 +31,8 @@
 #include <stdint.h>
 
 #include "libavutil/float_dsp.h"
+#include "libavutil/mem_internal.h"
+
 #include "atrac.h"
 #include "avcodec.h"
 #include "fft.h"

diff --git a/libavcodec/atrac3plusdec.c b/libavcodec/atrac3plusdec.c
index 2ae03d838f8b795844e24406b926cb429a7020fd..c024ab6bded112d5ff298045fed106858da55303 100644 (file)
--- a/libavcodec/atrac3plusdec.c
+++ b/libavcodec/atrac3plusdec.c
@@ -39,6 +39,7 @@
 
 #include "libavutil/channel_layout.h"
 #include "libavutil/float_dsp.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/thread.h"
 #include "avcodec.h"
 #include "get_bits.h"

diff --git a/libavcodec/atrac9dec.c b/libavcodec/atrac9dec.c
index f2413ef68a8f330663013b5286780cb916652a55..f88b25da48ef683f9339dfcf5542b950a24f7bbe 100644 (file)
--- a/libavcodec/atrac9dec.c
+++ b/libavcodec/atrac9dec.c
@@ -27,6 +27,7 @@
 #include "atrac9tab.h"
 #include "libavutil/lfg.h"
 #include "libavutil/float_dsp.h"
+#include "libavutil/mem_internal.h"
 
 #define ATRAC9_SF_VLC_BITS 8
 #define ATRAC9_COEFF_VLC_BITS 9

diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c
index 7b5965ede157f2cf5fde1dc3a3c82f2888935f19..381fc4cd1509a25fa1e05aafe0ecedbccd5c81f7 100644 (file)
--- a/libavcodec/binkaudio.c
+++ b/libavcodec/binkaudio.c
@@ -30,6 +30,7 @@
 
 #include "libavutil/channel_layout.h"
 #include "libavutil/intfloat.h"
+#include "libavutil/mem_internal.h"
 
 #define BITSTREAM_READER_LE
 #include "avcodec.h"

diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c
index 54e9bb4d8f606405ffdd37860ff53fcb903a3beb..3bbecf50ddc5ec017a8d4dfc3791138833e1c86f 100644 (file)
--- a/libavcodec/cabac.c
+++ b/libavcodec/cabac.c
@@ -27,6 +27,7 @@
 #include <string.h>
 
 #include "libavutil/common.h"
+#include "libavutil/mem_internal.h"
 
 #include "cabac.h"
 #include "cabac_functions.h"

diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c
index ba2b6ef2329871d3bdf0664958a45903abd6d478..74b83715010005dcedaec7b3a291c96e3a6bf0ac 100644 (file)
--- a/libavcodec/cavs.c
+++ b/libavcodec/cavs.c
@@ -25,6 +25,8 @@
  * @author Stefan Gehrer <stefan.gehrer@gmx.de>
  */
 
+#include "libavutil/mem_internal.h"
+
 #include "avcodec.h"
 #include "get_bits.h"
 #include "golomb.h"

diff --git a/libavcodec/cavs.h b/libavcodec/cavs.h
index 6bfb22ce48321b0d57ce1eda4391f3eb9c914c96..cbc163fb4de853d8392a69648f8683dfdc0317e2 100644 (file)
--- a/libavcodec/cavs.h
+++ b/libavcodec/cavs.h
@@ -22,6 +22,8 @@
 #ifndef AVCODEC_CAVS_H
 #define AVCODEC_CAVS_H
 
+#include "libavutil/mem_internal.h"
+
 #include "cavsdsp.h"
 #include "blockdsp.h"
 #include "h264chroma.h"

diff --git a/libavcodec/clearvideo.c b/libavcodec/clearvideo.c
index 7342557cd265353d2224445546a8c3fb2aeaee6c..79ba88857cb1f3696d740ddf8d01f8e706e33759 100644 (file)
--- a/libavcodec/clearvideo.c
+++ b/libavcodec/clearvideo.c
@@ -24,6 +24,7 @@
  * ClearVideo decoder
  */
 
+#include "libavutil/mem_internal.h"
 #include "libavutil/thread.h"
 
 #include "avcodec.h"

diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index 1968f2f8965fec9a7cc7fbe0ab455027bcaec229..a9de3c8b1a56d972ac38f05f8b5f21b017358727 100644 (file)
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -44,6 +44,7 @@
 
 #include "libavutil/channel_layout.h"
 #include "libavutil/lfg.h"
+#include "libavutil/mem_internal.h"
 
 #include "audiodsp.h"
 #include "avcodec.h"

diff --git a/libavcodec/dca_core.h b/libavcodec/dca_core.h
index 10128d1e32c88435ecfd5f64582650f7123a1d5b..86bfa6220340f22859a48b66583687e331ca935c 100644 (file)
--- a/libavcodec/dca_core.h
+++ b/libavcodec/dca_core.h
@@ -24,7 +24,7 @@
 #include "libavutil/common.h"
 #include "libavutil/float_dsp.h"
 #include "libavutil/fixed_dsp.h"
-#include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 
 #include "avcodec.h"
 #include "internal.h"

diff --git a/libavcodec/dca_lbr.h b/libavcodec/dca_lbr.h
index 6d4c0a8a63592dae21b50311a9ffebf7276312d1..e6856a2cf7c5b06e966569206f52f95cdd043194 100644 (file)
--- a/libavcodec/dca_lbr.h
+++ b/libavcodec/dca_lbr.h
@@ -23,7 +23,7 @@
 
 #include "libavutil/common.h"
 #include "libavutil/float_dsp.h"
-#include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 
 #include "avcodec.h"
 #include "internal.h"

diff --git a/libavcodec/dca_xll.h b/libavcodec/dca_xll.h
index bc0aa65b1af3df4654423a79cc67f5e98479d1ee..3aaad6d370dcb76d368f4ad29421f26185b66cfc 100644 (file)
--- a/libavcodec/dca_xll.h
+++ b/libavcodec/dca_xll.h
@@ -22,7 +22,7 @@
 #define AVCODEC_DCA_XLL_H
 
 #include "libavutil/common.h"
-#include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 
 #include "avcodec.h"
 #include "internal.h"

diff --git a/libavcodec/dcadata.c b/libavcodec/dcadata.c
index 1b646a7aa613c60eaaaa08f21ec287367f7aca77..643b0cc025e6bc1778b57f10071b6bfd096f3726 100644 (file)
--- a/libavcodec/dcadata.c
+++ b/libavcodec/dcadata.c
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 
-#include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 
 #include "dca.h"
 #include "dcadata.h"

diff --git a/libavcodec/dirac_vlc.c b/libavcodec/dirac_vlc.c
index 2e2fa7ea639ab7356a24141da630ab82d7c81502..2c07440df0534e8331e8195e9835ee48d3c40438 100644 (file)
--- a/libavcodec/dirac_vlc.c
+++ b/libavcodec/dirac_vlc.c
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/mem_internal.h"
+
 #include "dirac_vlc.h"
 
 enum {

diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
index ed42bc366a948614f9d373898dfbdf32c3b0e09d..b9999cde014cfe32c418f6eea5f35ae813abc764 100644 (file)
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -26,6 +26,7 @@
  * @author Marco Gerards <marco@gnu.org>, David Conrad, Jordi Ortiz <nenjordi@gmail.com>
  */
 
+#include "libavutil/mem_internal.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/thread.h"
 #include "avcodec.h"

diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c
index e5d01e2e71e577484cfbd65f82caf0f33e8783bc..09bc6f9b59ac539a1dafe86961ad86c45ff2d9c7 100644 (file)
--- a/libavcodec/dnxhddec.c
+++ b/libavcodec/dnxhddec.c
@@ -25,6 +25,8 @@
  */
 
 #include "libavutil/imgutils.h"
+#include "libavutil/mem_internal.h"
+
 #include "avcodec.h"
 #include "blockdsp.h"
 #define  UNCHECKED_BITSTREAM_READER 1

diff --git a/libavcodec/dnxhdenc.h b/libavcodec/dnxhdenc.h
index 7b0d862e28e8de06a5b809c02ed50dfc9d674b8a..9e4c869bc4b83a0a8bd74d5c05435e8ea51dfe6a 100644 (file)
--- a/libavcodec/dnxhdenc.h
+++ b/libavcodec/dnxhdenc.h
@@ -28,6 +28,8 @@
 
 #include "config.h"
 
+#include "libavutil/mem_internal.h"
+
 #include "mpegvideo.h"
 #include "dnxhddata.h"
 

diff --git a/libavcodec/dolby_e.h b/libavcodec/dolby_e.h
index ae04bf699ce75e556188430c889713f28bc6bb8a..68223a62efa3fdc9d90414ced952f983faefaa8f 100644 (file)
--- a/libavcodec/dolby_e.h
+++ b/libavcodec/dolby_e.h
@@ -23,7 +23,7 @@
 
 #include "libavutil/float_dsp.h"
 #include "libavutil/libm.h"
-#include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 
 #include "internal.h"
 #include "get_bits.h"

diff --git a/libavcodec/dss_sp.c b/libavcodec/dss_sp.c
index 71da65cecd0097a5b1527af7d860ef29d148a151..568757d212249e31e3ba9d145965be273b821a54 100644 (file)
--- a/libavcodec/dss_sp.c
+++ b/libavcodec/dss_sp.c
@@ -22,6 +22,7 @@
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"
 
 #include "avcodec.h"

diff --git a/libavcodec/dstdec.c b/libavcodec/dstdec.c
index 3fd710d2f6dfaa8569e4b8eb9cce884608f054d2..84d19b91aa0d538c979e243b492c4a3c36282fae 100644 (file)
--- a/libavcodec/dstdec.c
+++ b/libavcodec/dstdec.c
@@ -27,6 +27,7 @@
 
 #include "libavutil/avassert.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 #include "internal.h"
 #include "get_bits.h"
 #include "avcodec.h"

diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c
index 9dccddd6d384ae2bd5e412818f4b46dc50dbcf7c..2c03aa5a1cef4cf6d4c0546297b257599de7df51 100644 (file)
--- a/libavcodec/eamad.c
+++ b/libavcodec/eamad.c
@@ -28,6 +28,8 @@
  * http://wiki.multimedia.cx/index.php?title=Electronic_Arts_MAD
  */
 
+#include "libavutil/mem_internal.h"
+
 #include "avcodec.h"
 #include "blockdsp.h"
 #include "bytestream.h"

diff --git a/libavcodec/eatgq.c b/libavcodec/eatgq.c
index 1308c07cff4f74879e1bd9714e2be7a4efe93a9d..197ba6fc6e12b518ca90029da69610ec9e2dc4f7 100644 (file)
--- a/libavcodec/eatgq.c
+++ b/libavcodec/eatgq.c
@@ -29,6 +29,9 @@
  */
 
 #define BITSTREAM_READER_LE
+
+#include "libavutil/mem_internal.h"
+
 #include "aandcttab.h"
 #include "avcodec.h"
 #include "bytestream.h"

diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c
index 456bd3c5636c0d64becc995c455320ebeee4f19e..2be2737fd66747806242253a833e18900b8786e2 100644 (file)
--- a/libavcodec/eatqi.c
+++ b/libavcodec/eatqi.c
@@ -26,6 +26,8 @@
  * @see http://wiki.multimedia.cx/index.php?title=Electronic_Arts_TQI
  */
 
+#include "libavutil/mem_internal.h"
+
 #include "avcodec.h"
 #include "blockdsp.h"
 #include "bswapdsp.h"

diff --git a/libavcodec/fft.h b/libavcodec/fft.h
index c858570a21c0f2dff581385ec563b7fae29a7676..5f67b61f067c7dbfda1c69728ac08b2e517ca808 100644 (file)
--- a/libavcodec/fft.h
+++ b/libavcodec/fft.h
@@ -32,7 +32,8 @@
 
 #include <stdint.h>
 #include "config.h"
-#include "libavutil/mem.h"
+
+#include "libavutil/mem_internal.h"
 
 #if FFT_FLOAT
 

diff --git a/libavcodec/fic.c b/libavcodec/fic.c
index 95baaedaa5e18b90a50fd1c64ec85fe531197682..ef5f3f44d1ae7e1c4296902125dc25b20a619876 100644 (file)
--- a/libavcodec/fic.c
+++ b/libavcodec/fic.c
@@ -22,6 +22,7 @@
  */
 
 #include "libavutil/common.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"
 #include "avcodec.h"
 #include "internal.h"

diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index f6aa636bdea1475b766fcb1c616b47791f86cff1..70dc8c72a36e49e959fce5049298672ff4b268db 100644 (file)
--- a/libavcodec/g2meet.c
+++ b/libavcodec/g2meet.c
@@ -30,6 +30,7 @@
 
 #include "libavutil/imgutils.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 
 #include "avcodec.h"
 #include "blockdsp.h"

diff --git a/libavcodec/h264_mvpred.h b/libavcodec/h264_mvpred.h
index bf395e3fe296f651eb6b83951ddea34405c31f28..19d9ee462d469ebf8fafbfc554a8b5386f2bcce1 100644 (file)
--- a/libavcodec/h264_mvpred.h
+++ b/libavcodec/h264_mvpred.h
@@ -33,6 +33,7 @@
 #include "h264dec.h"
 #include "mpegutils.h"
 #include "libavutil/avassert.h"
+#include "libavutil/mem_internal.h"
 
 
 static av_always_inline int fetch_diagonal_mv(const H264Context *h, H264SliceContext *sl,

diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h
index 29c4d4e42c1e3445b9ddfce9beb49316670027d8..b3677cdbb9edc81fc597b7d4a4457fabf98abc64 100644 (file)
--- a/libavcodec/h264dec.h
+++ b/libavcodec/h264dec.h
@@ -30,6 +30,7 @@
 
 #include "libavutil/buffer.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/thread.h"
 
 #include "cabac.h"

diff --git a/libavcodec/hcadec.c b/libavcodec/hcadec.c
index 11cb157277aba0d3e40dc720b9731e64d4efb3bc..9c3eda21afda77d48b57d5a2392b0ff4ffa4f4f3 100644 (file)
--- a/libavcodec/hcadec.c
+++ b/libavcodec/hcadec.c
@@ -19,6 +19,7 @@
 #include "libavutil/crc.h"
 #include "libavutil/float_dsp.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/tx.h"
 
 #include "avcodec.h"

diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h
index c0a138e97aa0acbc04eb48d84e8ea08be273f395..b2aa392b4391e16b888dcb6e922d6fb26b24b771 100644 (file)
--- a/libavcodec/hevcdec.h
+++ b/libavcodec/hevcdec.h
@@ -27,6 +27,7 @@
 
 #include "libavutil/buffer.h"
 #include "libavutil/md5.h"
+#include "libavutil/mem_internal.h"
 
 #include "avcodec.h"
 #include "bswapdsp.h"

diff --git a/libavcodec/hevcdsp.h b/libavcodec/hevcdsp.h
index 0ae67cba8563ce78fb5088c48a0295c64cbfa378..c605a343d6d098fee88fc38420a7eb73d3659e40 100644 (file)
--- a/libavcodec/hevcdsp.h
+++ b/libavcodec/hevcdsp.h
@@ -25,6 +25,8 @@
 #ifndef AVCODEC_HEVCDSP_H
 #define AVCODEC_HEVCDSP_H
 
+#include "libavutil/mem_internal.h"
+
 #include "get_bits.h"
 
 #define MAX_PB_SIZE 64

diff --git a/libavcodec/hq_hqa.h b/libavcodec/hq_hqa.h
index 608e2ca1a6efdbba44d3ff5b698c18da61916de4..08d79e745415fdbef8a7c997e38c022ee3b8a5c7 100644 (file)
--- a/libavcodec/hq_hqa.h
+++ b/libavcodec/hq_hqa.h
@@ -23,6 +23,8 @@
 
 #include <stdint.h>
 
+#include "libavutil/mem_internal.h"
+
 #include "avcodec.h"
 #include "bytestream.h"
 #include "hq_hqadsp.h"

diff --git a/libavcodec/hqx.h b/libavcodec/hqx.h
index 50d60f9e0346438168c3398ecd1c96c8e513f908..3eddaafb2946f5611425887973f0e7dd2438773a 100644 (file)
--- a/libavcodec/hqx.h
+++ b/libavcodec/hqx.h
@@ -24,7 +24,8 @@
 #include <stdint.h>
 
 #include "libavutil/frame.h"
-#include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
+
 #include "get_bits.h"
 #include "hqxdsp.h"
 

diff --git a/libavcodec/imm4.c b/libavcodec/imm4.c
index 4cbafffd9d4537755b79951e2461f605ea65bf07..636130dd54df796a6bbfb109fd91240474698442 100644 (file)
--- a/libavcodec/imm4.c
+++ b/libavcodec/imm4.c
@@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "libavutil/mem_internal.h"
 #include "libavutil/thread.h"
 
 #include "avcodec.h"

diff --git a/libavcodec/mdct15.h b/libavcodec/mdct15.h
index 42e60f3e102c2b63c906016de08668dafd25f2ea..035246ff9787639a1e3ceb951607217d2f8330cb 100644 (file)
--- a/libavcodec/mdct15.h
+++ b/libavcodec/mdct15.h
@@ -23,6 +23,8 @@
 
 #include <stddef.h>
 
+#include "libavutil/mem_internal.h"
+
 #include "fft.h"
 
 typedef struct MDCT15Context {

diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c
index d0bb1162b6be19ec5a9d0a9e65d353600cd00c12..101e558336a27ec8f897b70dcddf51f9093c109f 100644 (file)
--- a/libavcodec/mdec.c
+++ b/libavcodec/mdec.c
@@ -27,6 +27,8 @@
  * This is very similar to intra-only MPEG-1.
  */
 
+#include "libavutil/mem_internal.h"
+
 #include "avcodec.h"
 #include "blockdsp.h"
 #include "bswapdsp.h"

diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c
index ea6a7efe93d8428a78e06a88c60ff85bf3e357da..407faa02da487758d9741532849e1673105f9195 100644 (file)
--- a/libavcodec/mimic.c
+++ b/libavcodec/mimic.c
@@ -23,6 +23,7 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "libavutil/mem_internal.h"
 #include "libavutil/thread.h"
 
 #include "avcodec.h"

diff --git a/libavcodec/mips/constants.c b/libavcodec/mips/constants.c
index a7c4a5ccf67a55f9c1cc8208a50fca173138af2b..8c990b61192baef17b39e1cb29a0e3391bb7df66 100644 (file)
--- a/libavcodec/mips/constants.c
+++ b/libavcodec/mips/constants.c
@@ -20,7 +20,7 @@
  */
 
 #include "config.h"
-#include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 #include "constants.h"
 
 DECLARE_ALIGNED(8, const uint64_t, ff_pw_1) =       {0x0001000100010001ULL};

diff --git a/libavcodec/mips/h264dsp_mmi.c b/libavcodec/mips/h264dsp_mmi.c
index 173e191c7719794685ab14663d8344014b89c0a7..d4fcef0d651d0f58c74153c3167df71855598f28 100644 (file)
--- a/libavcodec/mips/h264dsp_mmi.c
+++ b/libavcodec/mips/h264dsp_mmi.c
@@ -26,6 +26,7 @@
 #include "libavcodec/bit_depth_template.c"
 #include "h264dsp_mips.h"
 #include "libavutil/mips/mmiutils.h"
+#include "libavutil/mem_internal.h"
 
 void ff_h264_add_pixels4_8_mmi(uint8_t *dst, int16_t *src, int stride)
 {

diff --git a/libavcodec/mips/simple_idct_mmi.c b/libavcodec/mips/simple_idct_mmi.c
index 73d797ffbc84ae7dca7abd58a36e731e4fca2991..e4b58dcfdd95c3db5cfbea1eed73e1caa213b83a 100644 (file)
--- a/libavcodec/mips/simple_idct_mmi.c
+++ b/libavcodec/mips/simple_idct_mmi.c
@@ -26,6 +26,7 @@
 #include "constants.h"
 #include "libavutil/mips/asmdefs.h"
 #include "libavutil/mips/mmiutils.h"
+#include "libavutil/mem_internal.h"
 
 #define W1  22725  //cos(i*M_PI/16)*sqrt(2)*(1<<14) + 0.5
 #define W2  21407  //cos(i*M_PI/16)*sqrt(2)*(1<<14) + 0.5

diff --git a/libavcodec/mips/vc1dsp_mmi.c b/libavcodec/mips/vc1dsp_mmi.c
index 79f19a9b395b6b2787aacfc506fe2c7e8d280994..8355cd1b262b1ba6d5d2bc361cbef7195b6223b5 100644 (file)
--- a/libavcodec/mips/vc1dsp_mmi.c
+++ b/libavcodec/mips/vc1dsp_mmi.c
@@ -21,6 +21,8 @@
  */
 
 #include "libavutil/avassert.h"
+#include "libavutil/mem_internal.h"
+
 #include "libavcodec/vc1dsp.h"
 #include "constants.h"
 #include "vc1dsp_mips.h"

diff --git a/libavcodec/mips/vp8dsp_mmi.c b/libavcodec/mips/vp8dsp_mmi.c
index bd80aa1445bfbb52062f3e28b1059c5c4a0ed276..aa6e856dd26e50155f95a1a4ddca1e99a7c96a54 100644 (file)
--- a/libavcodec/mips/vp8dsp_mmi.c
+++ b/libavcodec/mips/vp8dsp_mmi.c
@@ -24,6 +24,7 @@
 #include "vp8dsp_mips.h"
 #include "constants.h"
 #include "libavutil/mips/mmiutils.h"
+#include "libavutil/mem_internal.h"
 
 #define DECLARE_DOUBLE_1            double db_1
 #define DECLARE_DOUBLE_2            double db_2

diff --git a/libavcodec/mips/xvid_idct_mmi.c b/libavcodec/mips/xvid_idct_mmi.c
index b822b8add8bd01b526f9f645ab70b9d397259ee2..034a48d2a2157cd887988142da3d71733a6cab57 100644 (file)
--- a/libavcodec/mips/xvid_idct_mmi.c
+++ b/libavcodec/mips/xvid_idct_mmi.c
@@ -21,6 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/mem_internal.h"
+
 #include "idctdsp_mips.h"
 #include "xvididct_mips.h"
 

diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h
index d9844adf4ef7f169e17dde35c9d20dc65571142a..fcbe58bcb8c37708ce72c67605120778e5fca861 100644 (file)
--- a/libavcodec/mjpegdec.h
+++ b/libavcodec/mjpegdec.h
@@ -30,6 +30,7 @@
 #define AVCODEC_MJPEGDEC_H
 
 #include "libavutil/log.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/stereo3d.h"
 

diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index 3b1608b29b8589b88a2a6e8c61b3830ee59d69d6..0c30034dd47e8d3b7298d1b9e70a86264c7276fd 100644 (file)
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -30,6 +30,7 @@
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/channel_layout.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/thread.h"
 #include "get_bits.h"
 #include "internal.h"

diff --git a/libavcodec/mpc.h b/libavcodec/mpc.h
index 704edc9a384a891d49790c6612090593d797ea81..f8093796a3abd793452ae823f8e727770c2327c1 100644 (file)
--- a/libavcodec/mpc.h
+++ b/libavcodec/mpc.h
@@ -30,6 +30,7 @@
 #define AVCODEC_MPC_H
 
 #include "libavutil/lfg.h"
+#include "libavutil/mem_internal.h"
 
 #include "avcodec.h"
 #include "bswapdsp.h"

diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 123ede4704e12c250182680d3955e4082fefc614..7b98d488a2f39267341b222b4977f783c383d2d4 100644 (file)
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -31,6 +31,7 @@
 #include "libavutil/attributes.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/stereo3d.h"
 
 #include "avcodec.h"

diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c
index 0ceeee2d46f239aa476ea8ef1bdebef18f7683b6..4fd9e3a6904b88069c346b2cc020709b6ad0abe2 100644 (file)
--- a/libavcodec/mpegaudiodec_template.c
+++ b/libavcodec/mpegaudiodec_template.c
@@ -30,7 +30,9 @@
 #include "libavutil/crc.h"
 #include "libavutil/float_dsp.h"
 #include "libavutil/libm.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/thread.h"
+
 #include "avcodec.h"
 #include "get_bits.h"
 #include "internal.h"

diff --git a/libavcodec/mpegaudiodsp_template.c b/libavcodec/mpegaudiodsp_template.c
index c67c456e8a75d3331f994cd7f5fc1ef14cdc6b8a..97317967a20b92a1ac4f6c624802ad283de5237c 100644 (file)
--- a/libavcodec/mpegaudiodsp_template.c
+++ b/libavcodec/mpegaudiodsp_template.c
@@ -22,7 +22,9 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/thread.h"
+
 #include "dct32.h"
 #include "mathops.h"
 #include "mpegaudiodsp.h"

diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c
index 9ea679d89f092759d30f298a0e64ec96f212b1a6..e091ec94bde4721e6e38f811f3a429c9c08b34f0 100644 (file)
--- a/libavcodec/nellymoserdec.c
+++ b/libavcodec/nellymoserdec.c
@@ -34,6 +34,7 @@
 #include "libavutil/channel_layout.h"
 #include "libavutil/float_dsp.h"
 #include "libavutil/lfg.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/random_seed.h"
 
 #define BITSTREAM_READER_LE

diff --git a/libavcodec/on2avc.c b/libavcodec/on2avc.c
index 3885f9acd7f0298911668004439791bc4778cc7c..d7a3e4945a160350332ce96b7aee3b169d91fa02 100644 (file)
--- a/libavcodec/on2avc.c
+++ b/libavcodec/on2avc.c
@@ -23,6 +23,8 @@
 #include "libavutil/channel_layout.h"
 #include "libavutil/ffmath.h"
 #include "libavutil/float_dsp.h"
+#include "libavutil/mem_internal.h"
+
 #include "avcodec.h"
 #include "bytestream.h"
 #include "fft.h"

diff --git a/libavcodec/opus.h b/libavcodec/opus.h
index fa63353e9b3002668600033511a64bdda48b333c..b73949a8112e3dc424055400223a23911a5f20b9 100644 (file)
--- a/libavcodec/opus.h
+++ b/libavcodec/opus.h
@@ -28,6 +28,7 @@
 #include "libavutil/audio_fifo.h"
 #include "libavutil/float_dsp.h"
 #include "libavutil/frame.h"
+#include "libavutil/mem_internal.h"
 
 #include "libswresample/swresample.h"
 

diff --git a/libavcodec/opus_celt.h b/libavcodec/opus_celt.h
index 7c1c5316b97e228d3c3ba9be1e68acb3617c09ea..661ca251de3d74c18e0520c94828cf380a9ae783 100644 (file)
--- a/libavcodec/opus_celt.h
+++ b/libavcodec/opus_celt.h
@@ -33,6 +33,7 @@
 #include "mdct15.h"
 #include "libavutil/float_dsp.h"
 #include "libavutil/libm.h"
+#include "libavutil/mem_internal.h"
 
 #define CELT_VECTORS                 11
 #define CELT_ALLOC_STEPS             6

diff --git a/libavcodec/opus_pvq.h b/libavcodec/opus_pvq.h
index 52f9a4e6d4167435d9a4aa62a23c1eedea1b969c..b30407f5aba5ad9d4cc3f5bdb4f294a4430a7229 100644 (file)
--- a/libavcodec/opus_pvq.h
+++ b/libavcodec/opus_pvq.h
@@ -23,6 +23,8 @@
 #ifndef AVCODEC_OPUS_PVQ_H
 #define AVCODEC_OPUS_PVQ_H
 
+#include "libavutil/mem_internal.h"
+
 #include "opus_celt.h"
 
 #define QUANT_FN(name) uint32_t (name)(struct CeltPVQ *pvq, CeltFrame *f,            \

diff --git a/libavcodec/opusenc.c b/libavcodec/opusenc.c
index 953749af3a539c9970990dfac469fb2b6d545920..8bc9e9dc4a27cf6ce377fdc1b0c292ce644e5f84 100644 (file)
--- a/libavcodec/opusenc.c
+++ b/libavcodec/opusenc.c
@@ -25,6 +25,7 @@
 #include "opustab.h"
 
 #include "libavutil/float_dsp.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"
 #include "internal.h"
 #include "bytestream.h"

diff --git a/libavcodec/opusenc_psy.h b/libavcodec/opusenc_psy.h
index b91e4f1b8b9897492d26faf92593648a8f858f7b..d4fb096a3d2ea18eff3d2b254a7bfbd9162815b3 100644 (file)
--- a/libavcodec/opusenc_psy.h
+++ b/libavcodec/opusenc_psy.h
@@ -22,6 +22,8 @@
 #ifndef AVCODEC_OPUSENC_PSY_H
 #define AVCODEC_OPUSENC_PSY_H
 
+#include "libavutil/mem_internal.h"
+
 #include "opusenc.h"
 #include "opusenc_utils.h"
 #include "libavfilter/window_func.h"

diff --git a/libavcodec/opustab.c b/libavcodec/opustab.c
index 7276dad7939f05a4bf1b323fdcb5a96f25b07305..29eb05a12ab7de7f5a56155a083086147de850d7 100644 (file)
--- a/libavcodec/opustab.c
+++ b/libavcodec/opustab.c
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/mem_internal.h"
+
 #include "opustab.h"
 
 const uint8_t ff_opus_default_coupled_streams[] = { 0, 1, 1, 2, 2, 2, 2, 3 };

diff --git a/libavcodec/ppc/h264chroma_template.c b/libavcodec/ppc/h264chroma_template.c
index 8f43e5dee14d88be5f28cc4f8ae866c2978ae41e..eda98c67ecf9a86689a65152a4ab9c328efb0071 100644 (file)
--- a/libavcodec/ppc/h264chroma_template.c
+++ b/libavcodec/ppc/h264chroma_template.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/ppc/util_altivec.h"
 
 /* this code assume that stride % 16 == 0 */

diff --git a/libavcodec/ppc/h264dsp.c b/libavcodec/ppc/h264dsp.c
index d8a3baa34d6f80442f054fb6d13f5599bf06cb5a..779092fd7655c04e88eb00aca3db3804acc4f17e 100644 (file)
--- a/libavcodec/ppc/h264dsp.c
+++ b/libavcodec/ppc/h264dsp.c
@@ -26,7 +26,7 @@
 #include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
 #include "libavutil/intreadwrite.h"
-#include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/ppc/cpu.h"
 #include "libavutil/ppc/util_altivec.h"
 

diff --git a/libavcodec/ppc/h264qpel.c b/libavcodec/ppc/h264qpel.c
index bef421fa4f7ee0ea4358fc56ee3f2af84a51c2bd..fe896c84532fbcb0975a2a419313a50f95752dab 100644 (file)
--- a/libavcodec/ppc/h264qpel.c
+++ b/libavcodec/ppc/h264qpel.c
@@ -23,6 +23,7 @@
 #include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/ppc/cpu.h"
 #include "libavutil/ppc/util_altivec.h"
 

diff --git a/libavcodec/ppc/mpegvideo_altivec.c b/libavcodec/ppc/mpegvideo_altivec.c
index 2c6ff9165b233b2e5398fe0ed1c0b9631eba2569..bcb59ba845c17b06ad9a4006de6bfe9b631af3ef 100644 (file)
--- a/libavcodec/ppc/mpegvideo_altivec.c
+++ b/libavcodec/ppc/mpegvideo_altivec.c
@@ -28,6 +28,7 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/ppc/cpu.h"
 #include "libavutil/ppc/util_altivec.h"
 

diff --git a/libavcodec/ppc/mpegvideodsp.c b/libavcodec/ppc/mpegvideodsp.c
index 990a974a4e3f230c4ad70d1114e58522c5939dac..81f4845e6e0fde68c35d717c2d2871d9039a901f 100644 (file)
--- a/libavcodec/ppc/mpegvideodsp.c
+++ b/libavcodec/ppc/mpegvideodsp.c
@@ -21,7 +21,7 @@
  */
 
 #include "libavutil/cpu.h"
-#include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/ppc/cpu.h"
 #include "libavutil/ppc/util_altivec.h"
 

diff --git a/libavcodec/ppc/vp8dsp_altivec.c b/libavcodec/ppc/vp8dsp_altivec.c
index 31201ed2d858192be798d7373de5e16161b3730c..64ee703dc773a64bd0b809eff27d52130f76b33f 100644 (file)
--- a/libavcodec/ppc/vp8dsp_altivec.c
+++ b/libavcodec/ppc/vp8dsp_altivec.c
@@ -23,7 +23,7 @@
 #include "config.h"
 
 #include "libavutil/cpu.h"
-#include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/ppc/cpu.h"
 #include "libavutil/ppc/util_altivec.h"
 

diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c
index 8e6f905a9fefb29c8292e240c0934cd3c2d3f89f..0e70163bcc3fac7596955e4c6c858b92ffa8f455 100644 (file)
--- a/libavcodec/proresenc_kostya.c
+++ b/libavcodec/proresenc_kostya.c
@@ -23,6 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "avcodec.h"

diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c
index 1eb6ce38bce4e31f46de25ffc7f59e30bdb4a2e8..07dea55a762c76c95cfb52bbb005cacbcd652e10 100644 (file)
--- a/libavcodec/qdm2.c
+++ b/libavcodec/qdm2.c
@@ -36,6 +36,7 @@
 #include <stdio.h>
 
 #include "libavutil/channel_layout.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/thread.h"
 
 #define BITSTREAM_READER_LE

diff --git a/libavcodec/ra144.h b/libavcodec/ra144.h
index 19a4ce09fe15c07a59152f62db52b187767303b4..82ef85288443752a63b4ec36505625ae1167ed29 100644 (file)
--- a/libavcodec/ra144.h
+++ b/libavcodec/ra144.h
@@ -23,6 +23,9 @@
 #define AVCODEC_RA144_H
 
 #include <stdint.h>
+
+#include "libavutil/mem_internal.h"
+
 #include "lpc.h"
 #include "audio_frame_queue.h"
 #include "audiodsp.h"

diff --git a/libavcodec/ra288.h b/libavcodec/ra288.h
index fa0b528b8a5c1893b5f2e9393f04df8da1f53a5c..96b074bffb2b7806d834f2c21c9a48531387726b 100644 (file)
--- a/libavcodec/ra288.h
+++ b/libavcodec/ra288.h
@@ -24,6 +24,7 @@
 
 #include <stdint.h>
 #include "libavutil/common.h"
+#include "libavutil/mem_internal.h"
 
 static const float amptable[8]={
      0.515625,  0.90234375,  1.57910156,  2.76342773,

diff --git a/libavcodec/rtjpeg.h b/libavcodec/rtjpeg.h
index d22ff4070e2f24001b0e27586d2fef1505e45b9d..d4dc0744081598a9f2d36cd2827d4070c5e190d3 100644 (file)
--- a/libavcodec/rtjpeg.h
+++ b/libavcodec/rtjpeg.h
@@ -24,7 +24,7 @@
 
 #include <stdint.h>
 
-#include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 #include "idctdsp.h"
 
 #define RTJPEG_FILE_VERSION 0

diff --git a/libavcodec/rv34.h b/libavcodec/rv34.h
index 1d5522538b87cb262e19b845e4c7298dad8d33d0..53b29dc245c838336f18b556d130d3d011997198 100644 (file)
--- a/libavcodec/rv34.h
+++ b/libavcodec/rv34.h
@@ -27,6 +27,8 @@
 #ifndef AVCODEC_RV34_H
 #define AVCODEC_RV34_H
 
+#include "libavutil/mem_internal.h"
+
 #include "avcodec.h"
 #include "mpegvideo.h"
 

diff --git a/libavcodec/sbc.h b/libavcodec/sbc.h
index de9c8d9aed352b951678027b9cd15ba17c89105f..419c8eab90943d941c9f186a7e788437673c4ec5 100644 (file)
--- a/libavcodec/sbc.h
+++ b/libavcodec/sbc.h
@@ -35,6 +35,7 @@
 
 #include "avcodec.h"
 #include "libavutil/crc.h"
+#include "libavutil/mem_internal.h"
 
 #define MSBC_BLOCKS 15
 

diff --git a/libavcodec/sbcdec.c b/libavcodec/sbcdec.c
index b8f01d5ff0eff9402fec10999684fc81613bc15f..bb590e8a05f74248e25e4a91beaeba4f6f0754fd 100644 (file)
--- a/libavcodec/sbcdec.c
+++ b/libavcodec/sbcdec.c
@@ -33,6 +33,7 @@
 #include "avcodec.h"
 #include "internal.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 #include "sbc.h"
 #include "sbcdec_data.h"
 

diff --git a/libavcodec/sbcdsp.h b/libavcodec/sbcdsp.h
index 334c058e6de022956c97546001844a29dbba8a40..24264df51d981c94abd38a713bc90e984b31f800 100644 (file)
--- a/libavcodec/sbcdsp.h
+++ b/libavcodec/sbcdsp.h
@@ -32,6 +32,8 @@
 #ifndef AVCODEC_SBCDSP_H
 #define AVCODEC_SBCDSP_H
 
+#include "libavutil/mem_internal.h"
+
 #include "sbc.h"
 #include "sbcdsp_data.h"
 

diff --git a/libavcodec/sbcdsp_data.c b/libavcodec/sbcdsp_data.c
index 78c07c007718161af2a29cdef77c79cc5007c29a..ad6390c7cfd5d07d55409e257a96c719ca087174 100644 (file)
--- a/libavcodec/sbcdsp_data.c
+++ b/libavcodec/sbcdsp_data.c
@@ -29,6 +29,8 @@
  * miscellaneous SBC tables
  */
 
+#include "libavutil/mem_internal.h"
+
 #include "sbcdsp_data.h"
 
 #define F_PROTO(x) ((int32_t) (((x) * 2) * ((int32_t) 1 << 15) + 0.5))

diff --git a/libavcodec/sbr.h b/libavcodec/sbr.h
index eb7d1aec09f07a63c119ac3cc886e69cd9ea8d9f..f80f122c51be683e2bc778ab771cc6133b68cbae 100644 (file)
--- a/libavcodec/sbr.h
+++ b/libavcodec/sbr.h
@@ -30,6 +30,9 @@
 #define AVCODEC_SBR_H
 
 #include <stdint.h>
+
+#include "libavutil/mem_internal.h"
+
 #include "fft.h"
 #include "aacps.h"
 #include "sbrdsp.h"

diff --git a/libavcodec/sinewin.h b/libavcodec/sinewin.h
index 13487409056e9b7f5c437fa4c86306d530f5c73e..e6de4dfe7b4cc8600ac308d71fa90eebec7dcfe7 100644 (file)
--- a/libavcodec/sinewin.h
+++ b/libavcodec/sinewin.h
@@ -22,7 +22,7 @@
 #define AVCODEC_SINEWIN_H
 
 #include "config.h"
-#include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 #include "libavcodec/aac_defines.h"
 
 #if CONFIG_HARDCODED_TABLES

diff --git a/libavcodec/sipr.h b/libavcodec/sipr.h
index 34f7f994cdee074f8eada0592a6f7c6d1dfa38d8..e1ef35d658731146b342488dd71a379aed79076d 100644 (file)
--- a/libavcodec/sipr.h
+++ b/libavcodec/sipr.h
@@ -26,7 +26,7 @@
 
 #include "avcodec.h"
 #include "acelp_pitch_delay.h"
-#include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 
 #define LP_FILTER_ORDER_16k  16
 #define L_SUBFR_16k          80

diff --git a/libavcodec/siren.c b/libavcodec/siren.c
index b1b49445621172e6bd11d6270fa5fa0f9b446f52..3d0cdd455408e58e41f985ca28defeb38dab9780 100644 (file)
--- a/libavcodec/siren.c
+++ b/libavcodec/siren.c
@@ -23,6 +23,7 @@
 
 #include "libavutil/tx.h"
 #include "libavutil/float_dsp.h"
+#include "libavutil/mem_internal.h"
 
 #include "avcodec.h"
 #include "get_bits.h"

diff --git a/libavcodec/svq1_cb.h b/libavcodec/svq1_cb.h
index 11f79691cdcc09ff4c4de1a6dd01117b592413f7..30cca19acc3809e2116bed73a0747bed795691bd 100644 (file)
--- a/libavcodec/svq1_cb.h
+++ b/libavcodec/svq1_cb.h
@@ -34,7 +34,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 
 /* 6x16-entry codebook for inter-coded 4x2 vectors */
 DECLARE_ALIGNED(4, static const int8_t, svq1_inter_codebook_4x2)[768] = {

diff --git a/libavcodec/svq1enc.h b/libavcodec/svq1enc.h
index b4ef76341737c91ca08b1be30c10e2577644460f..bb6af082d53acd1154efd85bbb5dbc11652a7836 100644 (file)
--- a/libavcodec/svq1enc.h
+++ b/libavcodec/svq1enc.h
@@ -24,6 +24,7 @@
 #include <stdint.h>
 
 #include "libavutil/frame.h"
+#include "libavutil/mem_internal.h"
 
 #include "avcodec.h"
 #include "hpeldsp.h"

diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index fb7b992496bb31fae898f713877e432c0b787868..54ef4add06bc9e49e80b1efea777af33b8bad217 100644 (file)
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -44,6 +44,7 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/crc.h"
+#include "libavutil/mem_internal.h"
 
 #include "internal.h"
 #include "avcodec.h"

diff --git a/libavcodec/tableprint.h b/libavcodec/tableprint.h
index 6f61c7124bd92dcb855ba25182bb4a8df0f86b5b..e57eeb6ca6134f9dd9cecf3f733bdab4e2df1a41 100644 (file)
--- a/libavcodec/tableprint.h
+++ b/libavcodec/tableprint.h
@@ -27,6 +27,7 @@
 #include <stdio.h>
 
 #include "libavutil/common.h"
+#include "libavutil/mem_internal.h"
 
 #define WRITE_1D_FUNC_ARGV(type, linebrk, fmtstr, ...)\
 void write_##type##_array(const type *data, int len)\

diff --git a/libavcodec/takdec.c b/libavcodec/takdec.c
index 6bf5dcc2d3dbeb4afed0c4b60ecfa9f2945ea369..931e5d3fb4e935ebe8015ddba93e3b4890038296 100644 (file)
--- a/libavcodec/takdec.c
+++ b/libavcodec/takdec.c
@@ -26,6 +26,7 @@
  */
 
 #include "libavutil/internal.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/samplefmt.h"
 
 #define BITSTREAM_READER_LE

diff --git a/libavcodec/truespeech.c b/libavcodec/truespeech.c
index 3cdae8c556f5eb84962f4f49908563a9dd80230a..272fc43deb4c981a3c5aaadfedb38b6eee817b88 100644 (file)
--- a/libavcodec/truespeech.c
+++ b/libavcodec/truespeech.c
@@ -21,6 +21,8 @@
 
 #include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
+
 #include "avcodec.h"
 #include "bswapdsp.h"
 #include "get_bits.h"

diff --git a/libavcodec/vorbis_data.c b/libavcodec/vorbis_data.c
index 063a075ce05f54ac92a22cf6198aa400ebc3d81e..4dba6a8cd3c2ab053c480234853d26b8a77154a0 100644 (file)
--- a/libavcodec/vorbis_data.c
+++ b/libavcodec/vorbis_data.c
@@ -19,7 +19,8 @@
  */
 
 #include "libavutil/channel_layout.h"
-#include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
+
 #include "vorbis.h"
 
 const uint8_t ff_vorbis_channel_layout_offsets[8][8] = {

diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index cf64a8c61e4767c60f279e5f8c79445fd17e6d6f..2a1da6b062d40bd0d7429679079afbc5d518fccf 100644 (file)
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -35,6 +35,7 @@
 #include <string.h>
 
 #include "libavutil/imgutils.h"
+#include "libavutil/mem_internal.h"
 
 #include "avcodec.h"
 #include "get_bits.h"

diff --git a/libavcodec/vp56.h b/libavcodec/vp56.h
index 65cf46870a1b32008de58711690a1eec30b720b5..46090f25c93c2eaaf33213db64e6f3ecb5782e5e 100644 (file)
--- a/libavcodec/vp56.h
+++ b/libavcodec/vp56.h
@@ -26,6 +26,8 @@
 #ifndef AVCODEC_VP56_H
 #define AVCODEC_VP56_H
 
+#include "libavutil/mem_internal.h"
+
 #include "avcodec.h"
 #include "get_bits.h"
 #include "hpeldsp.h"

diff --git a/libavcodec/vp8.h b/libavcodec/vp8.h
index 70d21e3c60460dc30bc9b87926e827f111b58c00..e6091dfe042d8c704f475aa8ebb15792f328be80 100644 (file)
--- a/libavcodec/vp8.h
+++ b/libavcodec/vp8.h
@@ -29,6 +29,7 @@
 #include <stdatomic.h>
 
 #include "libavutil/buffer.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/thread.h"
 
 #include "h264pred.h"

diff --git a/libavcodec/vp9dec.h b/libavcodec/vp9dec.h
index cc2440b854293382842b0c9cd5010c06a6086359..d82b258a3d81ba2ccd91e5f9fc2e525bdbb41c0b 100644 (file)
--- a/libavcodec/vp9dec.h
+++ b/libavcodec/vp9dec.h
@@ -29,6 +29,7 @@
 #include <stdatomic.h>
 
 #include "libavutil/buffer.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/thread.h"
 #include "libavutil/internal.h"
 

diff --git a/libavcodec/vp9dsp.c b/libavcodec/vp9dsp.c
index f6d73f73cd4d198d2eff84ab9a8f48aa55aefa54..41b8ad1ad17e82c82746a8cd71205b240118fde0 100644 (file)
--- a/libavcodec/vp9dsp.c
+++ b/libavcodec/vp9dsp.c
@@ -23,6 +23,8 @@
 
 #include "libavutil/avassert.h"
 #include "libavutil/common.h"
+#include "libavutil/mem_internal.h"
+
 #include "vp9dsp.h"
 
 const DECLARE_ALIGNED(16, int16_t, ff_vp9_subpel_filters)[3][16][8] = {

diff --git a/libavcodec/wma.h b/libavcodec/wma.h
index 7935bcdb3127d54086846f27199e6f3c058f1ea3..aea7ba28ab4c590e7dcd38cddea2d12bf5e1fd5c 100644 (file)
--- a/libavcodec/wma.h
+++ b/libavcodec/wma.h
@@ -23,6 +23,7 @@
 #define AVCODEC_WMA_H
 
 #include "libavutil/float_dsp.h"
+#include "libavutil/mem_internal.h"
 
 #include "avcodec.h"
 #include "fft.h"

diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
index a8fd99774e134f82955f2ca012ff1e4f0d7e70ed..e1fcf8afeb6a3692e852cfdaad9c8af77fd67a86 100644 (file)
--- a/libavcodec/wmalosslessdec.c
+++ b/libavcodec/wmalosslessdec.c
@@ -26,6 +26,7 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/avassert.h"
+#include "libavutil/mem_internal.h"
 
 #include "avcodec.h"
 #include "internal.h"

diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c
index 63e7680f9ac7ee49a325bc907605093338789e59..88ee5f4015a73b751d5203a56c487a4ac4dff3df 100644 (file)
--- a/libavcodec/wmaprodec.c
+++ b/libavcodec/wmaprodec.c
@@ -92,6 +92,8 @@
 #include "libavutil/float_dsp.h"
 #include "libavutil/intfloat.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
+
 #include "avcodec.h"
 #include "internal.h"
 #include "get_bits.h"

diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c
index a588bb6c845e1495db6841c85e38c40d3fd9d28d..fbdb865360c2fbc1643b15f6e411ac95a6aa6b9c 100644 (file)
--- a/libavcodec/wmavoice.c
+++ b/libavcodec/wmavoice.c
@@ -29,7 +29,7 @@
 
 #include "libavutil/channel_layout.h"
 #include "libavutil/float_dsp.h"
-#include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/thread.h"
 #include "avcodec.h"
 #include "internal.h"

diff --git a/libavcodec/wmv2.h b/libavcodec/wmv2.h
index 0f459ae5ae4bd8d43aba802177f3122a74477dcd..f425332c9a2c8f6f51baceb9794b88cbe2eb3434 100644 (file)
--- a/libavcodec/wmv2.h
+++ b/libavcodec/wmv2.h
@@ -21,6 +21,8 @@
 #ifndef AVCODEC_WMV2_H
 #define AVCODEC_WMV2_H
 
+#include "libavutil/mem_internal.h"
+
 #include "avcodec.h"
 #include "intrax8.h"
 #include "mpegvideo.h"

diff --git a/libavcodec/x86/constants.c b/libavcodec/x86/constants.c
index 4bfb78cc36116c4e4e1b5b64eea623b2b88e80bf..f2d267e85da00b368563050329c1f8ba2548be40 100644 (file)
--- a/libavcodec/x86/constants.c
+++ b/libavcodec/x86/constants.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/x86/asm.h" // for xmm_reg
 #include "constants.h"
 

diff --git a/libavcodec/x86/fdct.c b/libavcodec/x86/fdct.c
index 112566ded09cbdee58b04a1677ee12f8d1bbc910..d77f60c86fe59e9c28640b4f43ff6e07a49f8769 100644 (file)
--- a/libavcodec/x86/fdct.c
+++ b/libavcodec/x86/fdct.c
@@ -31,6 +31,7 @@
  */
 
 #include "libavutil/common.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/x86/asm.h"
 #include "fdct.h"
 

diff --git a/libavcodec/x86/me_cmp_init.c b/libavcodec/x86/me_cmp_init.c
index 6aec93e55ff18e5d2de87107da0e65687f8deacb..701eb1ab25e466c0bdb62ebd5e4c843a26f261ed 100644 (file)
--- a/libavcodec/x86/me_cmp_init.c
+++ b/libavcodec/x86/me_cmp_init.c
@@ -24,6 +24,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/me_cmp.h"

diff --git a/libavcodec/x86/mpegvideoenc.c b/libavcodec/x86/mpegvideoenc.c
index c884cf121bd2501216648841d0e67a86ba317ee3..4bad6a87efb9039049e29511c8a0f23a370d236b 100644 (file)
--- a/libavcodec/x86/mpegvideoenc.c
+++ b/libavcodec/x86/mpegvideoenc.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/avcodec.h"

diff --git a/libavfilter/ebur128.c b/libavfilter/ebur128.c
index ca2fca0066c82acf1fed43f23cce5c5c0e89cfa7..2e86974eba55661dafdbf133016c331e346d3787 100644 (file)
--- a/libavfilter/ebur128.c
+++ b/libavfilter/ebur128.c
@@ -49,6 +49,7 @@
 
 #include "libavutil/common.h"
 #include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/thread.h"
 
 #define CHECK_ERROR(condition, errorcode, goto_point)                          \

diff --git a/libavfilter/vf_colorspace.c b/libavfilter/vf_colorspace.c
index 39af74c221af7d4e6961a0541959cc0a6dd7f5ff..471669500b66dbe7c08667d1aac124ed124816cf 100644 (file)
--- a/libavfilter/vf_colorspace.c
+++ b/libavfilter/vf_colorspace.c
@@ -24,6 +24,7 @@
  */
 
 #include "libavutil/avassert.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/pixfmt.h"

diff --git a/libavfilter/vf_dctdnoiz.c b/libavfilter/vf_dctdnoiz.c
index cdbe5f853fb3681ded67b5221a567e660dbc0da6..a89f2631c829aa8afa8ea90f5ededf60e810f950 100644 (file)
--- a/libavfilter/vf_dctdnoiz.c
+++ b/libavfilter/vf_dctdnoiz.c
@@ -30,6 +30,7 @@
 
 #include "libavutil/avassert.h"
 #include "libavutil/eval.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"
 #include "internal.h"
 

diff --git a/libavfilter/vf_fspp.c b/libavfilter/vf_fspp.c
index c6989046c4ead0df04e3f0925c96001645ac7d4b..e57e6f9ec627aa920f1f120ee5c4603663f468ce 100644 (file)
--- a/libavfilter/vf_fspp.c
+++ b/libavfilter/vf_fspp.c
@@ -37,6 +37,7 @@
 
 #include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "internal.h"

diff --git a/libavfilter/vf_gradfun.c b/libavfilter/vf_gradfun.c
index f63128d72ecef9589a2b743f5b32e484e63baaa8..28da37ff93814124295ec22b0729de49042e371c 100644 (file)
--- a/libavfilter/vf_gradfun.c
+++ b/libavfilter/vf_gradfun.c
@@ -35,6 +35,7 @@
 #include "libavutil/imgutils.h"
 #include "libavutil/common.h"
 #include "libavutil/cpu.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "avfilter.h"

diff --git a/libavfilter/vf_owdenoise.c b/libavfilter/vf_owdenoise.c
index 6d6c2a3d539d6819bf1772559cdfea407fc23c45..7dfe10f2f1c0639d3ddfdf76cb2e14fad9f9a62d 100644 (file)
--- a/libavfilter/vf_owdenoise.c
+++ b/libavfilter/vf_owdenoise.c
@@ -30,6 +30,7 @@
 
 #include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/pixdesc.h"
 #include "avfilter.h"
 #include "internal.h"

diff --git a/libavfilter/vf_pp7.c b/libavfilter/vf_pp7.c
index 570a1c90b9bfc389cce78707acd6d94c1c763fe3..66979d9a13b4faf1266405c168aef942b238411e 100644 (file)
--- a/libavfilter/vf_pp7.c
+++ b/libavfilter/vf_pp7.c
@@ -29,6 +29,7 @@
 
 #include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "internal.h"

diff --git a/libavfilter/vf_spp.c b/libavfilter/vf_spp.c
index 4bcc6429e02022128dd6f0184a85932f6259afff..54457ebb0ba09bba3fece845e387f72f780532b3 100644 (file)
--- a/libavfilter/vf_spp.c
+++ b/libavfilter/vf_spp.c
@@ -33,6 +33,7 @@
 
 #include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "internal.h"

diff --git a/libavfilter/vf_uspp.c b/libavfilter/vf_uspp.c
index 6a814350e868d321906ea21381a162f569aba117..1acef67ffb07410ef615da2ce834ba0574e45910 100644 (file)
--- a/libavfilter/vf_uspp.c
+++ b/libavfilter/vf_uspp.c
@@ -29,6 +29,7 @@
 
 #include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "internal.h"

diff --git a/libavutil/aes_internal.h b/libavutil/aes_internal.h
index 494425878dc5a15881b101f5f5ab7c2a5f2a69c5..beee626831e82d6ed71f5de62c8b7911295cda89 100644 (file)
--- a/libavutil/aes_internal.h
+++ b/libavutil/aes_internal.h
@@ -21,7 +21,7 @@
 #ifndef AVUTIL_AES_INTERNAL_H
 #define AVUTIL_AES_INTERNAL_H
 
-#include "mem.h"
+#include "mem_internal.h"
 #include <stdint.h>
 
 typedef union {

diff --git a/libavutil/internal.h b/libavutil/internal.h
index 80c5d0632695c2912cfacad7c9c3d4c508c77f34..93ea57c324375e80b2e9050d6387db3e89569691 100644 (file)
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -43,7 +43,6 @@
 #include "cpu.h"
 #include "dict.h"
 #include "macros.h"
-#include "mem.h"
 #include "pixfmt.h"
 #include "version.h"
 

diff --git a/libavutil/lls.h b/libavutil/lls.h
index 1a276d537de435c9283abae558743b5f4412278a..5f849206f74d3c91709a13a1012736ef125bf998 100644 (file)
--- a/libavutil/lls.h
+++ b/libavutil/lls.h
@@ -24,7 +24,7 @@
 #define AVUTIL_LLS_H
 
 #include "macros.h"
-#include "mem.h"
+#include "mem_internal.h"
 #include "version.h"
 
 #define MAX_VARS 32

diff --git a/libavutil/mem.h b/libavutil/mem.h
index 5fb1a02dd9cf10a2e12784400c9e6da38d258cb3..e21a1feaaeab14d21ef93e3053e2de6b04b4097b 100644 (file)
--- a/libavutil/mem.h
+++ b/libavutil/mem.h
@@ -33,6 +33,7 @@
 #include "attributes.h"
 #include "error.h"
 #include "avutil.h"
+#include "version.h"
 
 /**
  * @addtogroup lavu_mem
@@ -49,6 +50,10 @@
  * dealing with memory consistently possible on all platforms.
  *
  * @{
+ */
+
+#if FF_API_DECLARE_ALIGNED
+/**
  *
  * @defgroup lavu_mem_macros Alignment Macros
  * Helper macros for declaring aligned variables.
@@ -125,6 +130,7 @@
 /**
  * @}
  */
+#endif
 
 /**
  * @defgroup lavu_mem_attrs Function Attributes

diff --git a/libavutil/mem_internal.h b/libavutil/mem_internal.h
index 14f45c657fba62fa885f416c99ae371aa33ab730..ee2575c85f9cd04a1d9c4f483dfc02fb598f09f4 100644 (file)
--- a/libavutil/mem_internal.h
+++ b/libavutil/mem_internal.h
@@ -27,6 +27,76 @@
 
 #include "avassert.h"
 #include "mem.h"
+#include "version.h"
+
+#if !FF_API_DECLARE_ALIGNED
+/**
+ * @def DECLARE_ALIGNED(n,t,v)
+ * Declare a variable that is aligned in memory.
+ *
+ * @code{.c}
+ * DECLARE_ALIGNED(16, uint16_t, aligned_int) = 42;
+ * DECLARE_ALIGNED(32, uint8_t, aligned_array)[128];
+ *
+ * // The default-alignment equivalent would be
+ * uint16_t aligned_int = 42;
+ * uint8_t aligned_array[128];
+ * @endcode
+ *
+ * @param n Minimum alignment in bytes
+ * @param t Type of the variable (or array element)
+ * @param v Name of the variable
+ */
+
+/**
+ * @def DECLARE_ASM_ALIGNED(n,t,v)
+ * Declare an aligned variable appropriate for use in inline assembly code.
+ *
+ * @code{.c}
+ * DECLARE_ASM_ALIGNED(16, uint64_t, pw_08) = UINT64_C(0x0008000800080008);
+ * @endcode
+ *
+ * @param n Minimum alignment in bytes
+ * @param t Type of the variable (or array element)
+ * @param v Name of the variable
+ */
+
+/**
+ * @def DECLARE_ASM_CONST(n,t,v)
+ * Declare a static constant aligned variable appropriate for use in inline
+ * assembly code.
+ *
+ * @code{.c}
+ * DECLARE_ASM_CONST(16, uint64_t, pw_08) = UINT64_C(0x0008000800080008);
+ * @endcode
+ *
+ * @param n Minimum alignment in bytes
+ * @param t Type of the variable (or array element)
+ * @param v Name of the variable
+ */
+
+#if defined(__INTEL_COMPILER) && __INTEL_COMPILER < 1110 || defined(__SUNPRO_C)
+    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
+    #define DECLARE_ASM_ALIGNED(n,t,v)  t __attribute__ ((aligned (n))) v
+    #define DECLARE_ASM_CONST(n,t,v)    const t __attribute__ ((aligned (n))) v
+#elif defined(__DJGPP__)
+    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (FFMIN(n, 16)))) v
+    #define DECLARE_ASM_ALIGNED(n,t,v)  t av_used __attribute__ ((aligned (FFMIN(n, 16)))) v
+    #define DECLARE_ASM_CONST(n,t,v)    static const t av_used __attribute__ ((aligned (FFMIN(n, 16)))) v
+#elif defined(__GNUC__) || defined(__clang__)
+    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
+    #define DECLARE_ASM_ALIGNED(n,t,v)  t av_used __attribute__ ((aligned (n))) v
+    #define DECLARE_ASM_CONST(n,t,v)    static const t av_used __attribute__ ((aligned (n))) v
+#elif defined(_MSC_VER)
+    #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
+#else
+    #define DECLARE_ALIGNED(n,t,v)      t v
+    #define DECLARE_ASM_ALIGNED(n,t,v)  t v
+    #define DECLARE_ASM_CONST(n,t,v)    static const t v
+#endif
+#endif
 
 // Some broken preprocessors need a second expansion
 // to be forced to tokenize __VA_ARGS__

diff --git a/libavutil/tests/aes_ctr.c b/libavutil/tests/aes_ctr.c
index 00fdb05d13a01a91a6a3cf1ecb5cf77cb012db06..53d0e4a244d708f07219f7754c83da0016a30e8e 100644 (file)
--- a/libavutil/tests/aes_ctr.c
+++ b/libavutil/tests/aes_ctr.c
@@ -18,6 +18,7 @@
 
 #include "libavutil/log.h"
 #include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/aes_ctr.h"
 
 static const DECLARE_ALIGNED(8, uint8_t, plain)[] = {

diff --git a/libavutil/tests/des.c b/libavutil/tests/des.c
index f2a5c34f1abe62edb4b43851cec147e77e75f686..8fa88df68426867a708e7b5888bd8abbec67ab61 100644 (file)
--- a/libavutil/tests/des.c
+++ b/libavutil/tests/des.c
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/mem_internal.h"
 #include "libavutil/timer.h"
 
 #include "libavutil/des.c"

diff --git a/libavutil/tx_priv.h b/libavutil/tx_priv.h
index e0d980abfba9d343a9c239c9e34c05b14c3d44bb..a3738f68bd43e876947271edbd15bbf973c6948a 100644 (file)
--- a/libavutil/tx_priv.h
+++ b/libavutil/tx_priv.h
@@ -23,6 +23,7 @@
 #include <stddef.h>
 #include "thread.h"
 #include "mem.h"
+#include "mem_internal.h"
 #include "avassert.h"
 #include "attributes.h"
 

diff --git a/libavutil/version.h b/libavutil/version.h
index 9b311b5b2786f2b8ed83c33263102d179c64b528..085c4e30f912a8d43ab540b796100f4604a2c159 100644 (file)
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -135,6 +135,9 @@
 #ifndef FF_API_D2STR
 #define FF_API_D2STR                    (LIBAVUTIL_VERSION_MAJOR < 58)
 #endif
+#ifndef FF_API_DECLARE_ALIGNED
+#define FF_API_DECLARE_ALIGNED          (LIBAVUTIL_VERSION_MAJOR < 58)
+#endif
 
 /**
  * @}

diff --git a/libpostproc/postprocess_altivec_template.c b/libpostproc/postprocess_altivec_template.c
index fa6ebe279d37c086a0b791197ac5b4c5fbb03bf2..a9d4cd29a3595d383fb3d7eef7808883799078ba 100644 (file)
--- a/libpostproc/postprocess_altivec_template.c
+++ b/libpostproc/postprocess_altivec_template.c
@@ -21,6 +21,7 @@
  */
 
 #include "libavutil/avutil.h"
+#include "libavutil/mem_internal.h"
 
 #define ALTIVEC_TRANSPOSE_8x8_SHORT(src_a,src_b,src_c,src_d,src_e,src_f,src_g,src_h) \
     do {                                                          \

diff --git a/libpostproc/postprocess_internal.h b/libpostproc/postprocess_internal.h
index 765fdeb14ac7f4d500fa7e18b7dafeb405e32c36..5d1aee362ea60c554da12b9fd56f64e0cb359e49 100644 (file)
--- a/libpostproc/postprocess_internal.h
+++ b/libpostproc/postprocess_internal.h
@@ -30,6 +30,7 @@
 #include "libavutil/avutil.h"
 #include "libavutil/intmath.h"
 #include "libavutil/log.h"
+#include "libavutil/mem_internal.h"
 #include "postprocess.h"
 
 #define V_DEBLOCK       0x01

diff --git a/libpostproc/postprocess_template.c b/libpostproc/postprocess_template.c
index df1684d1e22457886698c40b20ee3e18b1785228..411fc41915b060dde225b46ef31c5648229c2c5b 100644 (file)
--- a/libpostproc/postprocess_template.c
+++ b/libpostproc/postprocess_template.c
@@ -23,6 +23,7 @@
  * mmx/mmx2/3dnow postprocess code.
  */
 
+#include "libavutil/mem_internal.h"
 #include "libavutil/x86/asm.h"
 
 /* A single TEMPLATE_PP_* should be defined (to 1) when this template is

diff --git a/libswscale/output.c b/libswscale/output.c
index 4ef436e7e4cc0492a76559648fc435e50d7a9de3..e855ad606a0bbb51ab794b6b6c6b0b5fde47106f 100644 (file)
--- 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 536545293db826278beb1352efb229097fba7f2a..58e480dd2cdf3806de6feac8a21a6e3561de0106 100644 (file)
--- 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 9cb7e8f6acd065ce7838ec54a1f475f5dd35dbec..12160a169a4bfd90f6f432635a6db57e15517bcf 100644 (file)
--- 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 d207d3befff0c657c8d3086deb6c0335748f0eac..a1de95cee0089eb517176e8b155faa475dcd96d1 100644 (file)
--- 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 7e92f3fafcc883cb931c9c2ad3e8c5bba11fa95b..c4dd8a4d8312bdd9c1aeaf301416572c87fbe729 100644 (file)
--- 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 60a2cbfc5096fe7ae819482c2f3441a4b585941b..850f0add31811720e0905d9ab9a93a9e34f93805 100644 (file)
--- 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 2d6fc2ad266c38bd56258fff25b2625fd3af51c7..4344b5f7142af399529854bfd0e510cb40a30daa 100644 (file)
--- 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 3160fedf04917f569c0c726a81e70f5b26379c75..15c0b22f20d4bee7bd67bb89d3be347e35341e4a 100644 (file)
--- 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] = {