From fa908565d9f4ed2762ef57b17fab2192c7dfb381 Mon Sep 17 00:00:00 2001
From: Romain Beauxis <toots@rastageeks.org>
Date: Thu, 6 May 2021 22:09:46 -0500
Subject: [PATCH 1/2] Enable logs again DEPS=ocaml-ffmpeg#fix-logs

---
 src/tools/ffmpeg_utils.ml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/tools/ffmpeg_utils.ml b/src/tools/ffmpeg_utils.ml
index a3749d1b97..371c00a211 100644
--- a/src/tools/ffmpeg_utils.ml
+++ b/src/tools/ffmpeg_utils.ml
@@ -63,7 +63,6 @@ let conf_alpha =
   Dtools.Conf.bool ~p:(conf_ffmpeg#plug "alpha") ~d:false
     "Import and export alpha layers when converting to and from ffmpeg frames."
 
-(*
 let () =
   Lifecycle.before_start (fun () ->
       let verbosity =
@@ -83,7 +82,6 @@ let () =
       let level = conf_level#get in
       Avutil.Log.set_level verbosity;
       Avutil.Log.set_callback (fun s -> log#f level "%s" (String.trim s)))
-*)
 
 let best_pts frame =
   match Avutil.frame_pts frame with

From f93b062447597dab2122dd5b8e3aadeaeb47ec19 Mon Sep 17 00:00:00 2001
From: Romain Beauxis <toots@rastageeks.org>
Date: Thu, 6 May 2021 22:22:59 -0500
Subject: [PATCH 2/2] Start avdevice after setting up the logs.

---
 src/Makefile               | 2 +-
 src/tools/ffmpeg_utils.ml  | 6 ++++--
 src/tools/ffmpeg_utils.mli | 1 +
 src/tools/liqavdevice.ml   | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 6699df0d68..10d4ce2089 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -180,7 +180,6 @@ tools = tools/extralib.ml tools/JSON.ml tools/lifecycle.ml \
 	tools/stringView.ml tools/strings.ml tools/runtime_error.ml \
         tools/utils.ml tools/doc.ml tools/plug.ml \
 	tools/rqueue.ml tools/unifier.ml \
-	$(if $(W_FFMPEG_AVDEVICE),tools/liqavdevice.ml) \
 	$(if $(W_LAME_DYN),tools/lame_dynlink.ml) \
 	$(if $(W_FDKAAC_DYN),tools/fdkaac_dynlink.ml) \
 	tools/wav_aiff.ml tools/tutils.ml \
@@ -239,6 +238,7 @@ builtins = lang/lang_builtins.ml lang/builtins_ref.ml \
 liquidsoap_sources= \
 	tools/log.ml $(tools) converters/audio_converter.ml $(stream) \
 	$(if $(W_FFMPEG_AVUTIL),tools/ffmpeg_utils.ml) \
+        $(if $(W_FFMPEG_AVDEVICE),tools/liqavdevice.ml) \
         converters/video_converter.ml \
 	decoder/decoder_utils.ml decoder/decoder.ml \
         tools/liq_time.ml $(if $(W_POSIX_TIME2),tools/liq_posix_time.ml) \
diff --git a/src/tools/ffmpeg_utils.ml b/src/tools/ffmpeg_utils.ml
index 371c00a211..6644d2465b 100644
--- a/src/tools/ffmpeg_utils.ml
+++ b/src/tools/ffmpeg_utils.ml
@@ -63,8 +63,8 @@ let conf_alpha =
   Dtools.Conf.bool ~p:(conf_ffmpeg#plug "alpha") ~d:false
     "Import and export alpha layers when converting to and from ffmpeg frames."
 
-let () =
-  Lifecycle.before_start (fun () ->
+let log_start_atom =
+  Dtools.Init.make (fun () ->
       let verbosity =
         match conf_verbosity#get with
           | "quiet" -> `Quiet
@@ -83,6 +83,8 @@ let () =
       Avutil.Log.set_level verbosity;
       Avutil.Log.set_callback (fun s -> log#f level "%s" (String.trim s)))
 
+let () = Lifecycle.before_start (fun () -> Dtools.Init.exec log_start_atom)
+
 let best_pts frame =
   match Avutil.frame_pts frame with
     | Some pts -> Some pts
diff --git a/src/tools/ffmpeg_utils.mli b/src/tools/ffmpeg_utils.mli
index bfe49f38c9..2bc26ea658 100644
--- a/src/tools/ffmpeg_utils.mli
+++ b/src/tools/ffmpeg_utils.mli
@@ -23,6 +23,7 @@
 open Mm
 
 val log : Log.t
+val log_start_atom : Dtools.Init.t
 val conf_ffmpeg : Dtools.Conf.ut
 val conf_log : Dtools.Conf.ut
 val conf_verbosity : string Dtools.Conf.t
diff --git a/src/tools/liqavdevice.ml b/src/tools/liqavdevice.ml
index b13b871fba..0df71ca845 100644
--- a/src/tools/liqavdevice.ml
+++ b/src/tools/liqavdevice.ml
@@ -1 +1,2 @@
-let () = Avdevice.init ()
+let () =
+  ignore (Dtools.Init.make ~after:[Ffmpeg_utils.log_start_atom] Avdevice.init)