summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2021-03-02 10:55:16 +0100
committerAnton Khirnov <anton@khirnov.net>2021-06-10 16:51:44 +0200
commite91901adf66371bdb2d4c389b6736a8f95d50fdf (patch)
tree9e4af8c7e4bf2e58896d556dc5cba5c023b33b10
parentf3f404edd2298e051c72b9817bf0477ecb7dcb92 (diff)
lavc/cbs: avoid avcodec.h dependency
Include only the headers that are actually needed.
-rw-r--r--libavcodec/cbs.c1
-rw-r--r--libavcodec/cbs.h7
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