[FFmpeg-devel] [PATCH 04/10] avcodec/fft-internal: Make it a standalone header

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
---
ppc/fft_vsx.h uses sqrthalf (provided by fft-internal.h) which uses
M_SQRT1_2 which it seems to get via fft.h which includes mem_internal.h
which includes avassert.h which includes avutil.h which includes
mathematics.h which provides this. Several of these inclusions are
unnecessary, so I add these headers here to make the header usable on
its own even if the unnecessary inclusions are removed (which I intend
to do later).

 libavcodec/Makefile       | 1 -
 libavcodec/fft-internal.h | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index be64c82c66..9a6adb9903 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -1181,7 +1181,6 @@ SLIBOBJS-$(HAVE_GNU_WINDRES)           += avcodecres.o
 
 SKIPHEADERS                            += %_tablegen.h                  \
                                           %_tables.h                    \
-                                          fft-internal.h                \
                                           tableprint.h                  \
                                           tableprint_vlc.h              \
                                           aaccoder_twoloop.h            \
diff --git a/libavcodec/fft-internal.h b/libavcodec/fft-internal.h
index b0d8d80efd..d89a3e38ca 100644
--- a/libavcodec/fft-internal.h
+++ b/libavcodec/fft-internal.h
@@ -19,6 +19,9 @@
 #ifndef AVCODEC_FFT_INTERNAL_H
 #define AVCODEC_FFT_INTERNAL_H
 
+#include "libavutil/mathematics.h"
+#include "fft.h"
+
 #if FFT_FLOAT
 
 #define FIX15(v) (v)
-- 
2.30.2