Signed-off-by: Andreas Rheinhardt <[email protected]>
---
libavcodec/aacps.c | 3 +--
libavcodec/aacps.h | 2 +-
libavcodec/aacsbr_template.c | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/libavcodec/aacps.c b/libavcodec/aacps.c
index 655e8fe5b4..ed00006a3a 100644
--- a/libavcodec/aacps.c
+++ b/libavcodec/aacps.c
@@ -26,7 +26,6 @@
#include "libavutil/common.h"
#include "libavutil/mathematics.h"
#include "libavutil/mem_internal.h"
-#include "avcodec.h"
#include "aacps.h"
#if USE_FIXED
#include "aacps_fixed_tablegen.h"
@@ -717,7 +716,7 @@ static void stereo_processing(PSContext *ps, INTFLOAT
(*l)[32][2], INTFLOAT (*r)
}
}
-int AAC_RENAME(ff_ps_apply)(AVCodecContext *avctx, PSContext *ps, INTFLOAT
L[2][38][64], INTFLOAT R[2][38][64], int top)
+int AAC_RENAME(ff_ps_apply)(PSContext *ps, INTFLOAT L[2][38][64], INTFLOAT
R[2][38][64], int top)
{
INTFLOAT (*Lbuf)[32][2] = ps->Lbuf;
INTFLOAT (*Rbuf)[32][2] = ps->Rbuf;
diff --git a/libavcodec/aacps.h b/libavcodec/aacps.h
index 3efa38ad88..9d7e79c2b2 100644
--- a/libavcodec/aacps.h
+++ b/libavcodec/aacps.h
@@ -97,6 +97,6 @@ void AAC_RENAME(ff_ps_init)(void);
void AAC_RENAME(ff_ps_ctx_init)(PSContext *ps);
int ff_ps_read_data(AVCodecContext *avctx, GetBitContext *gb,
PSCommonContext *ps, int bits_left);
-int AAC_RENAME(ff_ps_apply)(AVCodecContext *avctx, PSContext *ps, INTFLOAT
L[2][38][64], INTFLOAT R[2][38][64], int top);
+int AAC_RENAME(ff_ps_apply)(PSContext *ps, INTFLOAT L[2][38][64], INTFLOAT
R[2][38][64], int top);
#endif /* AVCODEC_AACPS_H */
diff --git a/libavcodec/aacsbr_template.c b/libavcodec/aacsbr_template.c
index b33ffd4295..f3d3258d2e 100644
--- a/libavcodec/aacsbr_template.c
+++ b/libavcodec/aacsbr_template.c
@@ -1569,7 +1569,7 @@ void AAC_RENAME(ff_sbr_apply)(AACContext *ac,
SpectralBandReplication *sbr, int
if (ac->oc[1].m4ac.ps == 1) {
if (sbr->ps.common.start) {
- AAC_RENAME(ff_ps_apply)(ac->avctx, &sbr->ps, sbr->X[0], sbr->X[1],
sbr->kx[1] + sbr->m[1]);
+ AAC_RENAME(ff_ps_apply)(&sbr->ps, sbr->X[0], sbr->X[1], sbr->kx[1]
+ sbr->m[1]);
} else {
memcpy(sbr->X[1], sbr->X[0], sizeof(sbr->X[0]));
}
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".
