aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2024-03-25 01:30:37 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2024-03-31 00:08:43 +0100
commit790f793844390ece526ff654dc1bdddff5f5b4e8 (patch)
tree3545028e84a0e74a21df31d3cf398ed9284aade3 /libswresample
parentb616be1649f9a32411a3c5b62afe1d73f5a71ed0 (diff)
downloadffmpeg-790f793844390ece526ff654dc1bdddff5f5b4e8.tar.gz
avutil/common: Don't auto-include mem.h
There are lots of files that don't need it: The number of object files that actually need it went down from 2011 to 884 here. Keep it for external users in order to not cause breakages. Also improve the other headers a bit while just at it. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libswresample')
-rw-r--r--libswresample/audioconvert.c2
-rw-r--r--libswresample/dither.c1
-rw-r--r--libswresample/options.c1
-rw-r--r--libswresample/rematrix.c1
-rw-r--r--libswresample/resample.c2
-rw-r--r--libswresample/swresample.c1
-rw-r--r--libswresample/x86/rematrix_init.c1
7 files changed, 7 insertions, 2 deletions
diff --git a/libswresample/audioconvert.c b/libswresample/audioconvert.c
index 1d75ba1495..04108fb966 100644
--- a/libswresample/audioconvert.c
+++ b/libswresample/audioconvert.c
@@ -25,9 +25,9 @@
* @author Michael Niedermayer <michaelni@gmx.at>
*/
-#include "libavutil/avstring.h"
#include "libavutil/avassert.h"
#include "libavutil/libm.h"
+#include "libavutil/mem.h"
#include "libavutil/samplefmt.h"
#include "audioconvert.h"
diff --git a/libswresample/dither.c b/libswresample/dither.c
index 64068d35b6..61151a26ea 100644
--- a/libswresample/dither.c
+++ b/libswresample/dither.c
@@ -19,6 +19,7 @@
*/
#include "libavutil/avassert.h"
+#include "libavutil/mem.h"
#include "swresample_internal.h"
#include "noise_shaping_data.c"
diff --git a/libswresample/options.c b/libswresample/options.c
index a3284a4896..11b2884e3c 100644
--- a/libswresample/options.c
+++ b/libswresample/options.c
@@ -19,6 +19,7 @@
*/
#include "libavutil/channel_layout.h"
+#include "libavutil/mem.h"
#include "libavutil/opt.h"
#include "swresample_internal.h"
diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c
index fb4d9aecf0..b9bf4dcac0 100644
--- a/libswresample/rematrix.c
+++ b/libswresample/rematrix.c
@@ -21,6 +21,7 @@
#include "swresample_internal.h"
#include "libavutil/avassert.h"
#include "libavutil/channel_layout.h"
+#include "libavutil/mem.h"
#define TEMPLATE_REMATRIX_FLT
#include "rematrix_template.c"
diff --git a/libswresample/resample.c b/libswresample/resample.c
index 17cebad01b..2b8571bbd6 100644
--- a/libswresample/resample.c
+++ b/libswresample/resample.c
@@ -27,7 +27,7 @@
*/
#include "libavutil/avassert.h"
-#include "libavutil/cpu.h"
+#include "libavutil/mem.h"
#include "resample.h"
/**
diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 71b07d69bc..0a4e216f9b 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/mem.h"
#include "libavutil/opt.h"
#include "swresample_internal.h"
#include "audioconvert.h"
diff --git a/libswresample/x86/rematrix_init.c b/libswresample/x86/rematrix_init.c
index ce794eef90..623e154f5d 100644
--- a/libswresample/x86/rematrix_init.c
+++ b/libswresample/x86/rematrix_init.c
@@ -19,6 +19,7 @@
*/
#include "libavutil/attributes.h"
+#include "libavutil/mem.h"
#include "libavutil/x86/cpu.h"
#include "libswresample/swresample_internal.h"