[vlc-commits] [Git][videolan/vlc][master] 4 commits: meson: only use the contrib folder to build d3d11/dxva2 modules

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
a4432462 by Steve Lhomme at 2025-02-05T14:00:46+00:00
meson: only use the contrib folder to build d3d11/dxva2 modules

As in autotools, we check the libavcodec availability from the header.
And we do not want to link to any libavcodec/libavutil library.

- - - - -
376fa1a2 by Steve Lhomme at 2025-02-05T14:00:46+00:00
meson: only use compilation flags from libavcodec in avcodec_common

As in autotools we don't want to pick extra libraries linked in this library.

- - - - -
6ef80e88 by Steve Lhomme at 2025-02-05T14:00:46+00:00
meson: link the standalone libavformat_plugin with libavcodec

It uses:
- av_packet_unref() (20260c68d5b98012f928d2fdb09afb586caa24ba)
- av_packet_alloc() (16fd46fa506424134beb53ec88be3eea1b42a221)
- av_packet_side_data_get() (d3f5c8746f2884a46d8421cd051dc74b25000870)

- - - - -
687f2080 by Steve Lhomme at 2025-02-05T14:00:46+00:00
meson: remove merge-ffmpeg TODO

It is implemented.

- - - - -


3 changed files:

- meson_options.txt
- modules/codec/meson.build
- modules/demux/meson.build


Changes:

=====================================
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'),



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/00d0176322753bdecabcdf991e9771e1b563a916...687f208072a75658d32fe0a7539c4785aa7e6cd0

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/00d0176322753bdecabcdf991e9771e1b563a916...687f208072a75658d32fe0a7539c4785aa7e6cd0
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance