Commit 7c759ba8 authored by Max Kellermann's avatar Max Kellermann

lib/ffmpeg/meson.build: move libavutil helpers into separate library

parent 6d9b452f
...@@ -13,6 +13,29 @@ else ...@@ -13,6 +13,29 @@ else
endif endif
conf.set('HAVE_LIBAVFILTER', libavfilter_dep.found()) conf.set('HAVE_LIBAVFILTER', libavfilter_dep.found())
if not libavutil_dep.found()
ffmpeg_util_dep = dependency('', required: false)
ffmpeg_dep = dependency('', required: false)
subdir_done()
endif
ffmpeg_util = static_library(
'ffmpeg_util',
'Interleave.cxx',
'Error.cxx',
include_directories: inc,
dependencies: [
libavutil_dep,
],
)
ffmpeg_util_dep = declare_dependency(
link_with: ffmpeg_util,
dependencies: [
libavutil_dep,
],
)
if not enable_ffmpeg if not enable_ffmpeg
ffmpeg_dep = dependency('', required: false) ffmpeg_dep = dependency('', required: false)
subdir_done() subdir_done()
...@@ -36,10 +59,10 @@ ffmpeg = static_library( ...@@ -36,10 +59,10 @@ ffmpeg = static_library(
ffmpeg_sources, ffmpeg_sources,
include_directories: inc, include_directories: inc,
dependencies: [ dependencies: [
ffmpeg_util_dep,
libavformat_dep, libavformat_dep,
libavcodec_dep, libavcodec_dep,
libavfilter_dep, libavfilter_dep,
libavutil_dep,
log_dep, log_dep,
], ],
) )
...@@ -47,9 +70,9 @@ ffmpeg = static_library( ...@@ -47,9 +70,9 @@ ffmpeg = static_library(
ffmpeg_dep = declare_dependency( ffmpeg_dep = declare_dependency(
link_with: ffmpeg, link_with: ffmpeg,
dependencies: [ dependencies: [
ffmpeg_util_dep,
libavformat_dep, libavformat_dep,
libavcodec_dep, libavcodec_dep,
libavfilter_dep, libavfilter_dep,
libavutil_dep,
], ],
) )
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment