From 9fbbca97a4f086cb4be0016a137fa280ed2c99b9 Mon Sep 17 00:00:00 2001
From: emeric <itmfr@yahoo.fr>
Date: Fri, 21 Aug 2020 10:13:10 +0200
Subject: [PATCH] Made av libs private to liblmsav

---
 src/libs/av/CMakeLists.txt        | 10 ++++++----
 src/libs/av/impl/AvInfo.cpp       |  8 ++++++++
 src/libs/av/include/av/AvInfo.hpp | 10 ++--------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/libs/av/CMakeLists.txt b/src/libs/av/CMakeLists.txt
index 30e72176..ce3fb126 100644
--- a/src/libs/av/CMakeLists.txt
+++ b/src/libs/av/CMakeLists.txt
@@ -6,16 +6,15 @@ add_library(lmsav SHARED
 	impl/AvTypes.cpp
 	)
 
-# TODO make av libs private
 target_include_directories(lmsav INTERFACE
 	include
-	${AVCODEC_INCLUDE_DIR}
-	${AVFORMAT_INCLUDE_DIR}
-	${AVUTIL_INCLUDE_DIR}
 	)
 
 target_include_directories(lmsav PRIVATE
 	include/
+	${AVCODEC_INCLUDE_DIR}
+	${AVFORMAT_INCLUDE_DIR}
+	${AVUTIL_INCLUDE_DIR}
 	)
 
 target_link_libraries(lmsav PUBLIC
@@ -24,6 +23,9 @@ target_link_libraries(lmsav PUBLIC
 	avutil
 	std::filesystem
 	wt
+	)
+
+target_link_libraries(lmsav PRIVATE
 	${AVFORMAT_LIBRARY}
 	${AVUTIL_LIBRARY}
 	)
diff --git a/src/libs/av/impl/AvInfo.cpp b/src/libs/av/impl/AvInfo.cpp
index ff4d010d..aca3c045 100644
--- a/src/libs/av/impl/AvInfo.cpp
+++ b/src/libs/av/impl/AvInfo.cpp
@@ -19,6 +19,14 @@
 
 #include "av/AvInfo.hpp"
 
+extern "C"
+{
+#define __STDC_CONSTANT_MACROS
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libavutil/error.h>
+}
+
 #include <array>
 
 #include "utils/Logger.hpp"
diff --git a/src/libs/av/include/av/AvInfo.hpp b/src/libs/av/include/av/AvInfo.hpp
index 96dc33f4..d719ae02 100644
--- a/src/libs/av/include/av/AvInfo.hpp
+++ b/src/libs/av/include/av/AvInfo.hpp
@@ -21,14 +21,6 @@
 
 #pragma once
 
-extern "C"
-{
-#define __STDC_CONSTANT_MACROS
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-#include <libavutil/error.h>
-}
-
 #include <chrono>
 #include <filesystem>
 #include <map>
@@ -38,6 +30,8 @@ extern "C"
 
 #include "AvTypes.hpp"
 
+struct AVFormatContext;
+
 namespace Av
 {