Pārlūkot izejas kodu

lavc/cbs: avoid avcodec.h dependency

Include only the headers that are actually needed.
Anton Khirnov 4 gadi atpakaļ
vecāks
revīzija
e91901adf6
2 mainītis faili ar 6 papildinājumiem un 2 dzēšanām
  1. 1 0
      libavcodec/cbs.c
  2. 5 2
      libavcodec/cbs.h

+ 1 - 0
libavcodec/cbs.c

@@ -25,6 +25,7 @@
 #include "libavutil/common.h"
 #include "libavutil/common.h"
 #include "libavutil/opt.h"
 #include "libavutil/opt.h"
 
 
+#include "avcodec.h"
 #include "cbs.h"
 #include "cbs.h"
 #include "cbs_internal.h"
 #include "cbs_internal.h"
 
 

+ 5 - 2
libavcodec/cbs.h

@@ -24,7 +24,9 @@
 
 
 #include "libavutil/buffer.h"
 #include "libavutil/buffer.h"
 
 
-#include "avcodec.h"
+#include "codec_id.h"
+#include "codec_par.h"
+#include "packet.h"
 
 
 
 
 /*
 /*
@@ -40,6 +42,7 @@
  * bitstream.
  * bitstream.
  */
  */
 
 
+struct AVCodecContext;
 struct CodedBitstreamType;
 struct CodedBitstreamType;
 
 
 /**
 /**
@@ -271,7 +274,7 @@ int ff_cbs_read_extradata(CodedBitstreamContext *ctx,
  */
  */
 int ff_cbs_read_extradata_from_codec(CodedBitstreamContext *ctx,
 int ff_cbs_read_extradata_from_codec(CodedBitstreamContext *ctx,
                                      CodedBitstreamFragment *frag,
                                      CodedBitstreamFragment *frag,
-                                     const AVCodecContext *avctx);
+                                     const struct AVCodecContext *avctx);
 
 
 /**
 /**
  * Read the data bitstream from a packet into a fragment, then
  * Read the data bitstream from a packet into a fragment, then