diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-10-03 22:03:55 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-10-05 02:08:39 +0200 |
| commit | 542c334eb5450ea8a2ef74ca3b46b3defff61c79 (patch) | |
| tree | a8456a11cb9160511845d5e2a830d11e52db2571 | |
| parent | a622f4451f28248f36479a05ffa6c29c6850f4bf (diff) | |
| download | ffmpeg-542c334eb5450ea8a2ef74ca3b46b3defff61c79.tar.gz | |
avcodec/opus_celt, opus_pvq: Move CeltPVQ typedef to opus_pvq.h
It is more natural that way.
Reviewed-by: Lynne <dev@lynne.ee>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/opus_celt.h | 4 | ||||
| -rw-r--r-- | libavcodec/opus_pvq.h | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/libavcodec/opus_celt.h b/libavcodec/opus_celt.h index 19cf617652..c812b6645c 100644 --- a/libavcodec/opus_celt.h +++ b/libavcodec/opus_celt.h @@ -44,8 +44,6 @@ #define CELT_POSTFILTER_MINPERIOD 15 #define CELT_ENERGY_SILENCE (-28.0f) -typedef struct CeltPVQ CeltPVQ; - enum CeltSpread { CELT_SPREAD_NONE, CELT_SPREAD_LIGHT, @@ -96,7 +94,7 @@ struct CeltFrame { av_tx_fn tx_fn[4]; AVFloatDSPContext *dsp; CeltBlock block[2]; - CeltPVQ *pvq; + struct CeltPVQ *pvq; OpusDSP opusdsp; int channels; int output_channels; diff --git a/libavcodec/opus_pvq.h b/libavcodec/opus_pvq.h index b30407f5ab..b71bc49034 100644 --- a/libavcodec/opus_pvq.h +++ b/libavcodec/opus_pvq.h @@ -34,13 +34,13 @@ float *lowband_out, int level, float gain, \ float *lowband_scratch, int fill) -struct CeltPVQ { +typedef struct CeltPVQ { DECLARE_ALIGNED(32, int, qcoeff )[256]; DECLARE_ALIGNED(32, float, hadamard_tmp)[256]; float (*pvq_search)(float *X, int *y, int K, int N); QUANT_FN(*quant_band); -}; +} CeltPVQ; void ff_celt_pvq_init_x86(struct CeltPVQ *s); |