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.
5 years ago · e15371061d
parent c8c2dfbc37
commit e15371061d
144 changed files with 264 additions and 26 deletions
--- 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"
--- 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"
--- 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"

--- 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"
--- 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"
--- 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
--- 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"
--- 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>
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"

--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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 {
--- 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"
--- 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
--- 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"

--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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

--- 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"
--- 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"
--- 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,
--- 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"
--- 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"
--- 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"
--- 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
--- 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"
--- 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"

--- 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"
--- 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 {
--- 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"
--- 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"
--- 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};
--- 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)
 {
--- 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
--- 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"
--- 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
--- 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"

--- 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"

--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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
--- 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"
--- 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"

--- 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
--- 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,            \
--- 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"
--- 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"
--- 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 };
--- 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 */
--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"
--- 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
--- 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"
--- 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,
--- 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
--- 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"

--- 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

--- 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"

--- 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"

--- 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))
--- 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"
--- 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
--- 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
--- 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"
--- 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] = {
--- 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"
--- 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"
--- 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)\
--- 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
--- 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"
--- a/Show More
+++ b/Show More