Assume bsf.h exists.

avcodec/avcodec_stubs.c

@@ -18,12 +18,7 @@
 #include "media_types_stubs.h"
 
 #include <libavutil/replaygain.h>
-
-#include "config.h"
-
-#ifdef HAS_BSF_H
 #include <libavcodec/bsf.h>
-#endif
 
 #ifndef AV_PKT_FLAG_DISPOSABLE
 #define AV_PKT_FLAG_DISPOSABLE 0x0010

avcodec/config/discover.ml

@@ -1,15 +1,5 @@
 module C = Configurator.V1
 
-let has_bsf_h_code =
-  Printf.sprintf {|
-#include <libavcodec/bsf.h>
-
-int main()
-{
-  return 0;
-}
-|}
-
 let () =
   C.main ~name:"ffmpeg-avcodec-pkg-config" (fun c ->
       let default : C.Pkg_config.package_conf =
@@ -21,18 +11,11 @@ let () =
           | Some pc -> (
               match
                 C.Pkg_config.query_expr_err pc ~package:"libavcodec"
-                  ~expr:"libavcodec >= 57.107.100"
+                  ~expr:"libavcodec >= 58.87.100"
               with
                 | Error msg -> failwith msg
                 | Ok deps -> deps)
       in
       C.Flags.write_sexp "c_flags.sexp" conf.cflags;
       C.Flags.write_lines "c_flags" conf.cflags;
-      C.Flags.write_sexp "c_library_flags.sexp" conf.libs;
-
-      let has_bsf_h =
-        C.c_test ~c_flags:conf.cflags ~link_flags:conf.libs c has_bsf_h_code
-      in
-
-      C.C_define.gen_header_file c ~fname:"config.h"
-        [("HAS_BSF_H", Switch has_bsf_h)])
+      C.Flags.write_sexp "c_library_flags.sexp" conf.libs)

avcodec/dune

@@ -5,7 +5,6 @@
  (foreign_stubs
   (language c)
   (names avcodec_stubs)
-  (extra_deps config.h)
   (flags
    (:include c_flags.sexp)))
  (c_library_flags
@@ -14,15 +13,14 @@
  (libraries ffmpeg-avutil))
 
 (rule
- (targets c_flags c_flags.sexp c_library_flags.sexp config.h)
+ (targets c_flags c_flags.sexp c_library_flags.sexp)
  (action
   (run ./config/discover.exe)))
 
 (rule
  (targets avcodec_stubs.c)
  (mode fallback)
  (deps
-  config.h
   hw_config_method_stubs.h
   codec_capabilities_stubs.h
   codec_properties_stubs.h