From a622f4451f28248f36479a05ffa6c29c6850f4bf Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Mon, 3 Oct 2022 21:57:43 +0200
Subject: [PATCH] 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>
---
 libavcodec/opus.c      | 1 +
 libavcodec/opus_celt.h | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

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"