diff mbox series

[FFmpeg-devel,5/9] avcodec/opus_celt: Break cyclic inlusion of opus_celt.h<->opus_pvq.h

Message ID GV1P250MB073720A456EDE71EF8BFED778F5B9@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM
State Accepted
Commit a622f4451f28248f36479a05ffa6c29c6850f4bf
Headers show
Series [FFmpeg-devel,1/9] avutil/attributes_internal: Add visibility pragma | expand


Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Andreas Rheinhardt Oct. 3, 2022, 10:45 p.m. UTC
Simply don't include opus_pvq.h in opus_celt.h: The latter only
uses pointers to CeltPVQ.

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 mbox series


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"