From f3b6a28cc1115d1e5b3fadc3b51be770645144de Mon Sep 17 00:00:00 2001 From: Lynne Date: Tue, 19 Mar 2024 20:19:06 +0100 Subject: [PATCH 34/38] aacdec: move aacdec.h into libavcodec/aac --- libavcodec/aac/aacdec.c | 2 +- libavcodec/{ => aac}/aacdec.h | 4 ++-- libavcodec/aac/aacdec_dsp_template.c | 2 +- libavcodec/aac/aacdec_fixed.c | 2 +- libavcodec/aac/aacdec_fixed_coupling.h | 2 +- libavcodec/aac/aacdec_float.c | 2 +- libavcodec/aac/aacdec_float_coupling.h | 2 +- libavcodec/aacdec.c | 2 +- libavcodec/aacsbr.h | 2 +- libavcodec/aacsbr_template.c | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) rename libavcodec/{ => aac}/aacdec.h (99%) diff --git a/libavcodec/aac/aacdec.c b/libavcodec/aac/aacdec.c index 3af0e808fd..dfbc309583 100644 --- a/libavcodec/aac/aacdec.c +++ b/libavcodec/aac/aacdec.c @@ -34,7 +34,7 @@ #include "libavcodec/aac.h" #include "libavcodec/aacsbr.h" -#include "libavcodec/aacdec.h" +#include "aacdec.h" #include "libavcodec/avcodec.h" #include "libavutil/attributes.h" #include "libavutil/error.h" diff --git a/libavcodec/aacdec.h b/libavcodec/aac/aacdec.h similarity index 99% rename from libavcodec/aacdec.h rename to libavcodec/aac/aacdec.h index 3d15cef453..3b411e2be6 100644 --- a/libavcodec/aacdec.h +++ b/libavcodec/aac/aacdec.h @@ -38,8 +38,8 @@ #include "libavutil/mem_internal.h" #include "libavutil/tx.h" -#include "aac.h" -#include "mpeg4audio.h" +#include "libavcodec/aac.h" +#include "libavcodec/mpeg4audio.h" typedef struct AACDecContext AACDecContext; diff --git a/libavcodec/aac/aacdec_dsp_template.c b/libavcodec/aac/aacdec_dsp_template.c index f260d32e4a..a42b40f674 100644 --- a/libavcodec/aac/aacdec_dsp_template.c +++ b/libavcodec/aac/aacdec_dsp_template.c @@ -29,7 +29,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/aacdec.h" +#include "aacdec.h" #include "libavcodec/lpc_functions.h" #include "libavcodec/aactab.h" diff --git a/libavcodec/aac/aacdec_fixed.c b/libavcodec/aac/aacdec_fixed.c index d706cfcc92..a65ba19137 100644 --- a/libavcodec/aac/aacdec_fixed.c +++ b/libavcodec/aac/aacdec_fixed.c @@ -36,7 +36,7 @@ #include "libavcodec/aac_defines.h" #include "libavcodec/avcodec.h" -#include "libavcodec/aacdec.h" +#include "aacdec.h" #include "libavcodec/aactab.h" #include "libavcodec/sinewin_fixed_tablegen.h" #include "libavcodec/kbdwin.h" diff --git a/libavcodec/aac/aacdec_fixed_coupling.h b/libavcodec/aac/aacdec_fixed_coupling.h index 4a3dc3d9b1..1e15e71f0a 100644 --- a/libavcodec/aac/aacdec_fixed_coupling.h +++ b/libavcodec/aac/aacdec_fixed_coupling.h @@ -32,7 +32,7 @@ #ifndef AVCODEC_AAC_AACDEC_FIXED_COUPLING #define AVCODEC_AAC_AACDEC_FIXED_COUPLING -#include "libavcodec/aacdec.h" +#include "aacdec.h" /** * Apply dependent channel coupling (applied before IMDCT). diff --git a/libavcodec/aac/aacdec_float.c b/libavcodec/aac/aacdec_float.c index 6801085098..f0e69579f5 100644 --- a/libavcodec/aac/aacdec_float.c +++ b/libavcodec/aac/aacdec_float.c @@ -36,7 +36,7 @@ #include "libavcodec/aac_defines.h" #include "libavcodec/avcodec.h" -#include "libavcodec/aacdec.h" +#include "aacdec.h" #include "libavcodec/aactab.h" #include "libavcodec/sinewin.h" #include "libavcodec/kbdwin.h" diff --git a/libavcodec/aac/aacdec_float_coupling.h b/libavcodec/aac/aacdec_float_coupling.h index 8171750115..1832fa747d 100644 --- a/libavcodec/aac/aacdec_float_coupling.h +++ b/libavcodec/aac/aacdec_float_coupling.h @@ -32,7 +32,7 @@ #ifndef AVCODEC_AAC_AACDEC_FLOAT_COUPLING #define AVCODEC_AAC_AACDEC_FLOAT_COUPLING -#include "libavcodec/aacdec.h" +#include "aacdec.h" /** * Apply dependent channel coupling (applied before IMDCT). diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 6542f8e527..666e0c89db 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -42,7 +42,7 @@ #include "sinewin.h" #include "aac.h" -#include "aacdec.h" +#include "aac/aacdec.h" #include "aactab.h" #include "aac/aacdec_tab.h" #include "adts_header.h" diff --git a/libavcodec/aacsbr.h b/libavcodec/aacsbr.h index 41ac53acea..cd030aa801 100644 --- a/libavcodec/aacsbr.h +++ b/libavcodec/aacsbr.h @@ -30,7 +30,7 @@ #define AVCODEC_AACSBR_H #include "get_bits.h" -#include "aacdec.h" +#include "aac/aacdec.h" #include "aac_defines.h" #include "libavutil/attributes_internal.h" diff --git a/libavcodec/aacsbr_template.c b/libavcodec/aacsbr_template.c index 8bc2605db8..a7469eb92b 100644 --- a/libavcodec/aacsbr_template.c +++ b/libavcodec/aacsbr_template.c @@ -32,7 +32,7 @@ * @author Zoran Basaric ( zoran.basaric@imgtec.com ) */ -#include "aacdec.h" +#include "aac/aacdec.h" #include "aac/aacdec_tab.h" #include "avcodec.h" #include "libavutil/qsort.h" -- 2.43.0.381.gb435a96ce8