summaryrefslogtreecommitdiff
path: root/libavcodec/mips
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2020-05-27 14:54:38 +0200
committerAnton Khirnov <anton@khirnov.net>2021-01-01 14:14:57 +0100
commite15371061d23457554d241a80dc471515ac13ad4 (patch)
tree02400adf5d8667fed6f416c954ea41c055f8ef5c /libavcodec/mips
parentc8c2dfbc378e54aee7e8181ff532483096dc4bc7 (diff)
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.
Diffstat (limited to 'libavcodec/mips')
-rw-r--r--libavcodec/mips/constants.c2
-rw-r--r--libavcodec/mips/h264dsp_mmi.c1
-rw-r--r--libavcodec/mips/simple_idct_mmi.c1
-rw-r--r--libavcodec/mips/vc1dsp_mmi.c2
-rw-r--r--libavcodec/mips/vp8dsp_mmi.c1
-rw-r--r--libavcodec/mips/xvid_idct_mmi.c2
6 files changed, 8 insertions, 1 deletions
diff --git a/libavcodec/mips/constants.c b/libavcodec/mips/constants.c
index a7c4a5ccf6..8c990b6119 100644
--- 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 173e191c77..d4fcef0d65 100644
--- 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 73d797ffbc..e4b58dcfdd 100644
--- 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 79f19a9b39..8355cd1b26 100644
--- 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 bd80aa1445..aa6e856dd2 100644
--- 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 b822b8add8..034a48d2a2 100644
--- 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"