Skip to content

Commit

Permalink
lavu/mem: move the DECLARE_ALIGNED macro family to mem_internal on ne…
Browse files Browse the repository at this point in the history
…xt+1 bump

They are not properly namespaced and not intended for public use.
  • Loading branch information
elenril committed Jan 1, 2021
1 parent c8c2dfb commit e153710
Show file tree
Hide file tree
Showing 144 changed files with 264 additions and 26 deletions.
1 change: 1 addition & 0 deletions libavcodec/4xm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions libavcodec/aac.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions libavcodec/aacenc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 2 additions & 0 deletions libavcodec/aacps.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@

#include <stdint.h>

#include "libavutil/mem_internal.h"

#include "aacpsdsp.h"
#include "avcodec.h"
#include "get_bits.h"
Expand Down
1 change: 1 addition & 0 deletions libavcodec/aacps_fixed_tablegen.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion libavcodec/aacsbrdata.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions libavcodec/aactab.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion libavcodec/aactab.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions libavcodec/ac3dec.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions libavcodec/ac3dsp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion libavcodec/ac3tab.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
*/

#include "libavutil/channel_layout.h"
#include "libavutil/mem.h"
#include "libavutil/mem_internal.h"

#include "avcodec.h"
#include "ac3tab.h"
Expand Down
2 changes: 2 additions & 0 deletions libavcodec/agm.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@

#define BITSTREAM_READER_LE

#include "libavutil/mem_internal.h"

#include "avcodec.h"
#include "bytestream.h"
#include "copy_block.h"
Expand Down
2 changes: 2 additions & 0 deletions libavcodec/aic.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@

#include <inttypes.h>

#include "libavutil/mem_internal.h"

#include "avcodec.h"
#include "bytestream.h"
#include "internal.h"
Expand Down
1 change: 1 addition & 0 deletions libavcodec/arm/sbcdsp_init_arm.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
*/

#include "libavutil/cpu.h"
#include "libavutil/mem_internal.h"
#include "libavutil/arm/cpu.h"
#include "libavcodec/sbcdsp.h"

Expand Down
2 changes: 1 addition & 1 deletion libavcodec/asv.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

#include <stdint.h>

#include "libavutil/mem.h"
#include "libavutil/mem_internal.h"

#include "avcodec.h"
#include "blockdsp.h"
Expand Down
2 changes: 2 additions & 0 deletions libavcodec/atrac1.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions libavcodec/atrac3.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions libavcodec/atrac3plus.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions libavcodec/atrac3plusdec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions libavcodec/atrac9dec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions libavcodec/binkaudio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions libavcodec/cabac.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include <string.h>

#include "libavutil/common.h"
#include "libavutil/mem_internal.h"

#include "cabac.h"
#include "cabac_functions.h"
Expand Down
2 changes: 2 additions & 0 deletions libavcodec/cavs.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
* @author Stefan Gehrer <[email protected]>
*/

#include "libavutil/mem_internal.h"

#include "avcodec.h"
#include "get_bits.h"
#include "golomb.h"
Expand Down
2 changes: 2 additions & 0 deletions libavcodec/cavs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions libavcodec/clearvideo.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
* ClearVideo decoder
*/

#include "libavutil/mem_internal.h"
#include "libavutil/thread.h"

#include "avcodec.h"
Expand Down
1 change: 1 addition & 0 deletions libavcodec/cook.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@

#include "libavutil/channel_layout.h"
#include "libavutil/lfg.h"
#include "libavutil/mem_internal.h"

#include "audiodsp.h"
#include "avcodec.h"
Expand Down
2 changes: 1 addition & 1 deletion libavcodec/dca_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion libavcodec/dca_lbr.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion libavcodec/dca_xll.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion libavcodec/dcadata.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#include <stdint.h>

#include "libavutil/mem.h"
#include "libavutil/mem_internal.h"

#include "dca.h"
#include "dcadata.h"
Expand Down
2 changes: 2 additions & 0 deletions libavcodec/dirac_vlc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions libavcodec/diracdec.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
* @author Marco Gerards <[email protected]>, David Conrad, Jordi Ortiz <[email protected]>
*/

#include "libavutil/mem_internal.h"
#include "libavutil/pixdesc.h"
#include "libavutil/thread.h"
#include "avcodec.h"
Expand Down
2 changes: 2 additions & 0 deletions libavcodec/dnxhddec.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
*/

#include "libavutil/imgutils.h"
#include "libavutil/mem_internal.h"

#include "avcodec.h"
#include "blockdsp.h"
#define UNCHECKED_BITSTREAM_READER 1
Expand Down
2 changes: 2 additions & 0 deletions libavcodec/dnxhdenc.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@

#include "config.h"

#include "libavutil/mem_internal.h"

#include "mpegvideo.h"
#include "dnxhddata.h"

Expand Down
2 changes: 1 addition & 1 deletion libavcodec/dolby_e.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions libavcodec/dss_sp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions libavcodec/dstdec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions libavcodec/eamad.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions libavcodec/eatgq.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
*/

#define BITSTREAM_READER_LE

#include "libavutil/mem_internal.h"

#include "aandcttab.h"
#include "avcodec.h"
#include "bytestream.h"
Expand Down
2 changes: 2 additions & 0 deletions libavcodec/eatqi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion libavcodec/fft.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@

#include <stdint.h>
#include "config.h"
#include "libavutil/mem.h"

#include "libavutil/mem_internal.h"

#if FFT_FLOAT

Expand Down
1 change: 1 addition & 0 deletions libavcodec/fic.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
*/

#include "libavutil/common.h"
#include "libavutil/mem_internal.h"
#include "libavutil/opt.h"
#include "avcodec.h"
#include "internal.h"
Expand Down
1 change: 1 addition & 0 deletions libavcodec/g2meet.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

#include "libavutil/imgutils.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/mem_internal.h"

#include "avcodec.h"
#include "blockdsp.h"
Expand Down
1 change: 1 addition & 0 deletions libavcodec/h264_mvpred.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions libavcodec/h264dec.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

#include "libavutil/buffer.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/mem_internal.h"
#include "libavutil/thread.h"

#include "cabac.h"
Expand Down
1 change: 1 addition & 0 deletions libavcodec/hcadec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading

0 comments on commit e153710

Please sign in to comment.