Merge branch 'master' of github.com:h4tr3d/avcpp

Author: h4tr3d

src/CMakeLists.txt

@@ -88,7 +88,7 @@ if (AVCPP_NOT_SUBPROJECT)
     install(EXPORT avcpp-targets
         FILE avcpp-targets.cmake
         NAMESPACE avcpp::
-        DESTINATION lib/cmake/avcpp)
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/avcpp)
 
     include(CMakePackageConfigHelpers)
     configure_package_config_file(

src/formatcontext.cpp

@@ -9,6 +9,13 @@
 #include "codeccontext.h"
 #include "codecparameters.h"
 
+#if !API_AVFORMAT_URL
+extern "C"
+{
+  #include <libavutil/avstring.h>
+}
+#endif
+
 using namespace std;
 
 namespace {
@@ -60,7 +67,7 @@ void set_uri(AVFormatContext *ctx, string_view uri)
             av_free(ctx->url);
         ctx->url = av_strdup(uri.data());
 #else
-        av_strlcpy(ctx->filename, uri.data(), std::min<size_t>(sizeof(m_raw->filename), uri.size() + 1));
+        av_strlcpy(ctx->filename, uri.data(), std::min<size_t>(sizeof(ctx->filename), uri.size() + 1));
         ctx->filename[uri.size()] = '\0';
 #endif
     }

tests/meson.build

@@ -5,7 +5,7 @@ catch2 = dependency('catch2', required: true, fallback:['catch2','catch2_dep'])
 main_test = static_library(
     'main_test', 
     'test-main.cpp', 
-    dependencies: catch2
+    dependencies: [catch2, avcpp_dep]
 )
 
 main_test_dep = declare_dependency(