Message ID | AS8P250MB0744CC0DBB81CC118A101FB48F5A2@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM |
---|---|
State | Accepted |
Commit | 80eca6ec994bf29c9f0d0c11b0f39072e35c542f |
Headers | show |
Series | [FFmpeg-devel,1/8] avcodec/aacdec_template: Don't use intermediate void* | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
diff --git a/libavcodec/aacps.c b/libavcodec/aacps.c index 5a3e6b3dfd..6008edd332 100644 --- a/libavcodec/aacps.c +++ b/libavcodec/aacps.c @@ -740,8 +740,3 @@ int AAC_RENAME(ff_ps_apply)(PSContext *ps, INTFLOAT L[2][38][64], INTFLOAT R[2][ av_cold void AAC_RENAME(ff_ps_init)(void) { ps_tableinit(); } - -av_cold void AAC_RENAME(ff_ps_ctx_init)(PSContext *ps) -{ - AAC_RENAME(ff_psdsp_init)(&ps->dsp); -} diff --git a/libavcodec/aacps.h b/libavcodec/aacps.h index c8814b4c3d..08c92dc404 100644 --- a/libavcodec/aacps.h +++ b/libavcodec/aacps.h @@ -93,7 +93,12 @@ extern const int8_t ff_k_to_i_34[]; void ff_ps_init_common(void); void AAC_RENAME(ff_ps_init)(void); -void AAC_RENAME(ff_ps_ctx_init)(PSContext *ps); + +static inline void AAC_RENAME(ff_ps_ctx_init)(PSContext *ps) +{ + AAC_RENAME(ff_psdsp_init)(&ps->dsp); +} + int ff_ps_read_data(void *logctx, GetBitContext *gb, PSCommonContext *ps, int bits_left); int AAC_RENAME(ff_ps_apply)(PSContext *ps, INTFLOAT L[2][38][64], INTFLOAT R[2][38][64], int top);
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/aacps.c | 5 ----- libavcodec/aacps.h | 7 ++++++- 2 files changed, 6 insertions(+), 6 deletions(-)