Skip to content

Commit e153710

Browse files
committed
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.
1 parent c8c2dfb commit e153710

File tree

144 files changed

+264
-26
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+264
-26
lines changed

libavcodec/4xm.c

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include "libavutil/frame.h"
3131
#include "libavutil/imgutils.h"
3232
#include "libavutil/intreadwrite.h"
33+
#include "libavutil/mem_internal.h"
3334
#include "avcodec.h"
3435
#include "blockdsp.h"
3536
#include "bswapdsp.h"

libavcodec/aac.h

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include "aac_defines.h"
3535
#include "libavutil/float_dsp.h"
3636
#include "libavutil/fixed_dsp.h"
37+
#include "libavutil/mem_internal.h"
3738
#include "avcodec.h"
3839
#if !USE_FIXED
3940
#include "mdct15.h"

libavcodec/aacenc.h

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
#define AVCODEC_AACENC_H
2424

2525
#include "libavutil/float_dsp.h"
26+
#include "libavutil/mem_internal.h"
27+
2628
#include "avcodec.h"
2729
#include "put_bits.h"
2830

libavcodec/aacps.h

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
#include <stdint.h>
2626

27+
#include "libavutil/mem_internal.h"
28+
2729
#include "aacpsdsp.h"
2830
#include "avcodec.h"
2931
#include "get_bits.h"

libavcodec/aacps_fixed_tablegen.h

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#include "libavutil/common.h"
3838
#include "libavutil/mathematics.h"
3939
#include "libavutil/mem.h"
40+
#include "libavutil/mem_internal.h"
4041

4142
#include "aac_defines.h"
4243
#include "libavutil/softfloat.h"

libavcodec/aacsbrdata.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#define AVCODEC_AACSBRDATA_H
3030

3131
#include <stdint.h>
32-
#include "libavutil/mem.h"
32+
#include "libavutil/mem_internal.h"
3333
#include "aac_defines.h"
3434

3535
///< Huffman tables for SBR

libavcodec/aactab.c

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929

3030
#include "config.h"
3131
#include "libavutil/mem.h"
32+
#include "libavutil/mem_internal.h"
3233
#include "libavutil/thread.h"
3334
#include "aac.h"
3435
#include "aactab.h"

libavcodec/aactab.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#ifndef AVCODEC_AACTAB_H
3131
#define AVCODEC_AACTAB_H
3232

33-
#include "libavutil/mem.h"
33+
#include "libavutil/mem_internal.h"
3434
#include "aac.h"
3535

3636
#include <stdint.h>

libavcodec/ac3dec.h

+2
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@
5353
#include "libavutil/float_dsp.h"
5454
#include "libavutil/fixed_dsp.h"
5555
#include "libavutil/lfg.h"
56+
#include "libavutil/mem_internal.h"
57+
5658
#include "ac3.h"
5759
#include "ac3dsp.h"
5860
#include "bswapdsp.h"

libavcodec/ac3dsp.c

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2020
*/
2121

22+
#include "libavutil/mem_internal.h"
23+
2224
#include "avcodec.h"
2325
#include "ac3.h"
2426
#include "ac3dsp.h"

libavcodec/ac3tab.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626

2727
#include "libavutil/channel_layout.h"
28-
#include "libavutil/mem.h"
28+
#include "libavutil/mem_internal.h"
2929

3030
#include "avcodec.h"
3131
#include "ac3tab.h"

libavcodec/agm.c

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626

2727
#define BITSTREAM_READER_LE
2828

29+
#include "libavutil/mem_internal.h"
30+
2931
#include "avcodec.h"
3032
#include "bytestream.h"
3133
#include "copy_block.h"

libavcodec/aic.c

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222

2323
#include <inttypes.h>
2424

25+
#include "libavutil/mem_internal.h"
26+
2527
#include "avcodec.h"
2628
#include "bytestream.h"
2729
#include "internal.h"

libavcodec/arm/sbcdsp_init_arm.c

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
*/
3131

3232
#include "libavutil/cpu.h"
33+
#include "libavutil/mem_internal.h"
3334
#include "libavutil/arm/cpu.h"
3435
#include "libavcodec/sbcdsp.h"
3536

libavcodec/asv.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
#include <stdint.h>
3030

31-
#include "libavutil/mem.h"
31+
#include "libavutil/mem_internal.h"
3232

3333
#include "avcodec.h"
3434
#include "blockdsp.h"

libavcodec/atrac1.c

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
#include <stdio.h>
3434

3535
#include "libavutil/float_dsp.h"
36+
#include "libavutil/mem_internal.h"
37+
3638
#include "avcodec.h"
3739
#include "get_bits.h"
3840
#include "fft.h"

libavcodec/atrac3.c

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
#include "libavutil/attributes.h"
4040
#include "libavutil/float_dsp.h"
4141
#include "libavutil/libm.h"
42+
#include "libavutil/mem_internal.h"
4243
#include "libavutil/thread.h"
4344

4445
#include "avcodec.h"

libavcodec/atrac3plus.h

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
#include <stdint.h>
3232

3333
#include "libavutil/float_dsp.h"
34+
#include "libavutil/mem_internal.h"
35+
3436
#include "atrac.h"
3537
#include "avcodec.h"
3638
#include "fft.h"

libavcodec/atrac3plusdec.c

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939

4040
#include "libavutil/channel_layout.h"
4141
#include "libavutil/float_dsp.h"
42+
#include "libavutil/mem_internal.h"
4243
#include "libavutil/thread.h"
4344
#include "avcodec.h"
4445
#include "get_bits.h"

libavcodec/atrac9dec.c

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "atrac9tab.h"
2828
#include "libavutil/lfg.h"
2929
#include "libavutil/float_dsp.h"
30+
#include "libavutil/mem_internal.h"
3031

3132
#define ATRAC9_SF_VLC_BITS 8
3233
#define ATRAC9_COEFF_VLC_BITS 9

libavcodec/binkaudio.c

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
#include "libavutil/channel_layout.h"
3232
#include "libavutil/intfloat.h"
33+
#include "libavutil/mem_internal.h"
3334

3435
#define BITSTREAM_READER_LE
3536
#include "avcodec.h"

libavcodec/cabac.c

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <string.h>
2828

2929
#include "libavutil/common.h"
30+
#include "libavutil/mem_internal.h"
3031

3132
#include "cabac.h"
3233
#include "cabac_functions.h"

libavcodec/cavs.c

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
* @author Stefan Gehrer <[email protected]>
2626
*/
2727

28+
#include "libavutil/mem_internal.h"
29+
2830
#include "avcodec.h"
2931
#include "get_bits.h"
3032
#include "golomb.h"

libavcodec/cavs.h

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
#ifndef AVCODEC_CAVS_H
2323
#define AVCODEC_CAVS_H
2424

25+
#include "libavutil/mem_internal.h"
26+
2527
#include "cavsdsp.h"
2628
#include "blockdsp.h"
2729
#include "h264chroma.h"

libavcodec/clearvideo.c

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
* ClearVideo decoder
2525
*/
2626

27+
#include "libavutil/mem_internal.h"
2728
#include "libavutil/thread.h"
2829

2930
#include "avcodec.h"

libavcodec/cook.c

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444

4545
#include "libavutil/channel_layout.h"
4646
#include "libavutil/lfg.h"
47+
#include "libavutil/mem_internal.h"
4748

4849
#include "audiodsp.h"
4950
#include "avcodec.h"

libavcodec/dca_core.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "libavutil/common.h"
2525
#include "libavutil/float_dsp.h"
2626
#include "libavutil/fixed_dsp.h"
27-
#include "libavutil/mem.h"
27+
#include "libavutil/mem_internal.h"
2828

2929
#include "avcodec.h"
3030
#include "internal.h"

libavcodec/dca_lbr.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include "libavutil/common.h"
2525
#include "libavutil/float_dsp.h"
26-
#include "libavutil/mem.h"
26+
#include "libavutil/mem_internal.h"
2727

2828
#include "avcodec.h"
2929
#include "internal.h"

libavcodec/dca_xll.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#define AVCODEC_DCA_XLL_H
2323

2424
#include "libavutil/common.h"
25-
#include "libavutil/mem.h"
25+
#include "libavutil/mem_internal.h"
2626

2727
#include "avcodec.h"
2828
#include "internal.h"

libavcodec/dcadata.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#include <stdint.h>
2424

25-
#include "libavutil/mem.h"
25+
#include "libavutil/mem_internal.h"
2626

2727
#include "dca.h"
2828
#include "dcadata.h"

libavcodec/dirac_vlc.c

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1717
*/
1818

19+
#include "libavutil/mem_internal.h"
20+
1921
#include "dirac_vlc.h"
2022

2123
enum {

libavcodec/diracdec.c

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
* @author Marco Gerards <[email protected]>, David Conrad, Jordi Ortiz <[email protected]>
2727
*/
2828

29+
#include "libavutil/mem_internal.h"
2930
#include "libavutil/pixdesc.h"
3031
#include "libavutil/thread.h"
3132
#include "avcodec.h"

libavcodec/dnxhddec.c

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
*/
2626

2727
#include "libavutil/imgutils.h"
28+
#include "libavutil/mem_internal.h"
29+
2830
#include "avcodec.h"
2931
#include "blockdsp.h"
3032
#define UNCHECKED_BITSTREAM_READER 1

libavcodec/dnxhdenc.h

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828

2929
#include "config.h"
3030

31+
#include "libavutil/mem_internal.h"
32+
3133
#include "mpegvideo.h"
3234
#include "dnxhddata.h"
3335

libavcodec/dolby_e.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include "libavutil/float_dsp.h"
2525
#include "libavutil/libm.h"
26-
#include "libavutil/mem.h"
26+
#include "libavutil/mem_internal.h"
2727

2828
#include "internal.h"
2929
#include "get_bits.h"

libavcodec/dss_sp.c

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "libavutil/channel_layout.h"
2323
#include "libavutil/common.h"
2424
#include "libavutil/mem.h"
25+
#include "libavutil/mem_internal.h"
2526
#include "libavutil/opt.h"
2627

2728
#include "avcodec.h"

libavcodec/dstdec.c

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
#include "libavutil/avassert.h"
2929
#include "libavutil/intreadwrite.h"
30+
#include "libavutil/mem_internal.h"
3031
#include "internal.h"
3132
#include "get_bits.h"
3233
#include "avcodec.h"

libavcodec/eamad.c

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
* http://wiki.multimedia.cx/index.php?title=Electronic_Arts_MAD
2929
*/
3030

31+
#include "libavutil/mem_internal.h"
32+
3133
#include "avcodec.h"
3234
#include "blockdsp.h"
3335
#include "bytestream.h"

libavcodec/eatgq.c

+3
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
*/
3030

3131
#define BITSTREAM_READER_LE
32+
33+
#include "libavutil/mem_internal.h"
34+
3235
#include "aandcttab.h"
3336
#include "avcodec.h"
3437
#include "bytestream.h"

libavcodec/eatqi.c

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
* @see http://wiki.multimedia.cx/index.php?title=Electronic_Arts_TQI
2727
*/
2828

29+
#include "libavutil/mem_internal.h"
30+
2931
#include "avcodec.h"
3032
#include "blockdsp.h"
3133
#include "bswapdsp.h"

libavcodec/fft.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232

3333
#include <stdint.h>
3434
#include "config.h"
35-
#include "libavutil/mem.h"
35+
36+
#include "libavutil/mem_internal.h"
3637

3738
#if FFT_FLOAT
3839

libavcodec/fic.c

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
*/
2323

2424
#include "libavutil/common.h"
25+
#include "libavutil/mem_internal.h"
2526
#include "libavutil/opt.h"
2627
#include "avcodec.h"
2728
#include "internal.h"

libavcodec/g2meet.c

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
#include "libavutil/imgutils.h"
3232
#include "libavutil/intreadwrite.h"
33+
#include "libavutil/mem_internal.h"
3334

3435
#include "avcodec.h"
3536
#include "blockdsp.h"

libavcodec/h264_mvpred.h

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include "h264dec.h"
3434
#include "mpegutils.h"
3535
#include "libavutil/avassert.h"
36+
#include "libavutil/mem_internal.h"
3637

3738

3839
static av_always_inline int fetch_diagonal_mv(const H264Context *h, H264SliceContext *sl,

libavcodec/h264dec.h

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
#include "libavutil/buffer.h"
3232
#include "libavutil/intreadwrite.h"
33+
#include "libavutil/mem_internal.h"
3334
#include "libavutil/thread.h"
3435

3536
#include "cabac.h"

libavcodec/hcadec.c

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "libavutil/crc.h"
2020
#include "libavutil/float_dsp.h"
2121
#include "libavutil/intreadwrite.h"
22+
#include "libavutil/mem_internal.h"
2223
#include "libavutil/tx.h"
2324

2425
#include "avcodec.h"

0 commit comments

Comments
 (0)