aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-10-03 21:57:43 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-10-05 02:08:16 +0200
commita622f4451f28248f36479a05ffa6c29c6850f4bf (patch)
tree3ee01599b567397d82ca384a553b82cd6bb1d3b5
parent4fc2531fff112836026aad2bdaf128c9d15a72e3 (diff)
downloadffmpeg-a622f4451f28248f36479a05ffa6c29c6850f4bf.tar.gz
avcodec/opus_celt: Break cyclic inlusion of opus_celt.h<->opus_pvq.h
Simply don't include opus_pvq.h in opus_celt.h: The latter only uses pointers to CeltPVQ. Reviewed-by: Lynne <dev@lynne.ee> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-rw-r--r--libavcodec/opus.c1
-rw-r--r--libavcodec/opus_celt.h1
2 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/opus.c b/libavcodec/opus.c
index 791e25c488..a24c38be52 100644
--- a/libavcodec/opus.c
+++ b/libavcodec/opus.c
@@ -22,6 +22,7 @@
#include <stdint.h>
#include "opus_celt.h"
+#include "opus_pvq.h"
#include "opustab.h"
void ff_celt_quant_bands(CeltFrame *f, OpusRangeCoder *rc)
diff --git a/libavcodec/opus_celt.h b/libavcodec/opus_celt.h
index 291a544298..19cf617652 100644
--- a/libavcodec/opus_celt.h
+++ b/libavcodec/opus_celt.h
@@ -27,7 +27,6 @@
#include <float.h>
#include "opus.h"
-#include "opus_pvq.h"
#include "opusdsp.h"
#include "libavutil/float_dsp.h"