meson_options.txt

@@ -772,7 +772,6 @@ option('nfs',
 # TODO: Missing v4l2
 # TODO: Missing rpi-omxil
 # TODO: Missing gst-decode
-# TODO: Missing merge-ffmpeg
 # TODO: Missing libva
 # TODO: Missing tremor
 # TODO: Missing x26410b

modules/codec/meson.build

@@ -571,7 +571,9 @@ libavcodec_common = disabler()
 if avcodec_dep.found()
     libavcodec_common = static_library('avcodec_common',
         files('avcodec/fourcc.c', 'avcodec/chroma.c'),
-        dependencies: [avutil_dep, avcodec_dep],
+        dependencies: [
+            avcodec_dep.partial_dependency(includes:true, compile_args:true)
+        ],
         install: false,
         include_directories: [
             vlc_include_dirs,
@@ -667,13 +669,13 @@ if host_system == 'windows'
                     '../packetizer/hevc_nal.c',
                     'avcodec/dxva_blocklist.c',
                 ),
+            'c_args' : [ contrib_inc_args ],
             'cpp_args' : libcom_cppflags,
             'link_with' : [ d3d11_common_lib ],
             'include_directories' : [
                 vlc_include_dirs,
                 include_directories('avcodec')
             ],
-            'dependencies' : [avcodec_dep, avutil_dep],
         }
     endif
 
@@ -691,12 +693,13 @@ if host_system == 'windows'
                     '../packetizer/hevc_nal.c',
                     'avcodec/dxva_blocklist.c',
                 ),
+            'c_args' : [ contrib_inc_args ],
             'link_with' : [ d3d9_common_lib ],
             'include_directories' : [
                 vlc_include_dirs,
                 include_directories('avcodec')
             ],
-            'dependencies' : [avcodec_dep, avutil_dep, cc.find_library('dxva2')],
+            'dependencies' : [cc.find_library('dxva2')],
         }
     endif
 

modules/demux/meson.build

@@ -246,7 +246,7 @@ if avformat_dep.found()
             'avformat/avformat.c',
             avformat_extra_sources
         ),
-        'dependencies' : [avformat_dep, avutil_dep],
+        'dependencies' : [avformat_dep, avutil_dep, avcodec_dep],
         'link_with' : [libavcodec_common],
         'link_args' : symbolic_linkargs,
         'enabled' : not get_option('merge-ffmpeg'),