[FFmpeg-cvslog] lavc/cbs: avoid avcodec.h dependency

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Mar  2 10:55:16 2021 +0100| [e91901adf66371bdb2d4c389b6736a8f95d50fdf] | committer: Anton Khirnov

lavc/cbs: avoid avcodec.h dependency

Include only the headers that are actually needed.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e91901adf66371bdb2d4c389b6736a8f95d50fdf
---

 libavcodec/cbs.c | 1 +
 libavcodec/cbs.h | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c
index bbfafb6530..8d50ea1432 100644
--- a/libavcodec/cbs.c
+++ b/libavcodec/cbs.c
@@ -25,6 +25,7 @@
 #include "libavutil/common.h"
 #include "libavutil/opt.h"
 
+#include "avcodec.h"
 #include "cbs.h"
 #include "cbs_internal.h"
 
diff --git a/libavcodec/cbs.h b/libavcodec/cbs.h
index f022282b75..b7acf98347 100644
--- a/libavcodec/cbs.h
+++ b/libavcodec/cbs.h
@@ -24,7 +24,9 @@
 
 #include "libavutil/buffer.h"
 
-#include "avcodec.h"
+#include "codec_id.h"
+#include "codec_par.h"
+#include "packet.h"
 
 
 /*
@@ -40,6 +42,7 @@
  * bitstream.
  */
 
+struct AVCodecContext;
 struct CodedBitstreamType;
 
 /**
@@ -271,7 +274,7 @@ int ff_cbs_read_extradata(CodedBitstreamContext *ctx,
  */
 int ff_cbs_read_extradata_from_codec(CodedBitstreamContext *ctx,
                                      CodedBitstreamFragment *frag,
-                                     const AVCodecContext *avctx);
+                                     const struct AVCodecContext *avctx);
 
 /**
  * Read the data bitstream from a packet into a fragment, then