[vlc-commits] [Git][videolan/vlc][master] 6 commits: modules: bank: fix HAVE_DYNAMIC_PLUGINS not defined

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
0fb347db by Alexandre Janniaux at 2022-02-26T10:51:50+00:00
modules: bank: fix HAVE_DYNAMIC_PLUGINS not defined

- - - - -
35732459 by Alexandre Janniaux at 2022-02-26T10:51:50+00:00
missing: fix harmless warnings

vlc_sdp_Start is not defined publicly in the core anymore, and
owner_size was not used in sout_EncoderCreate.

- - - - -
4bf4de3d by Alexandre Janniaux at 2022-02-26T10:51:50+00:00
config: file: remove unused function

- - - - -
90372a0b by Alexandre Janniaux at 2022-02-26T10:51:50+00:00
config: core: remove unused function

- - - - -
3fd01098 by Alexandre Janniaux at 2022-02-26T10:51:50+00:00
emscripten: netconf: include vlc_network

vlc_network.h is necessary for the declaration of vlc_getProxyUrl.

- - - - -
bb5bfa7b by Alexandre Janniaux at 2022-02-26T10:51:50+00:00
drm_display: remove unused variable

- - - - -


6 changed files:

- modules/video_output/drm_display.c
- src/config/core.c
- src/config/file.c
- src/emscripten/netconf.c
- src/missing.c
- src/modules/bank.c


Changes:

=====================================
modules/video_output/drm_display.c
=====================================
@@ -429,7 +429,6 @@ static bool ChromaNegotiation(vout_display_t *vd)
 
 static void CustomDestroyPicture(vout_display_t *vd)
 {
-    vout_window_t *wnd = vd->cfg->window;
     for (int c = 0; c < MAXHWBUF; c++)
         DestroyFB(vd, c);
 }


=====================================
src/config/core.c
=====================================
@@ -42,11 +42,6 @@
 vlc_mutex_t config_lock = VLC_STATIC_MUTEX;
 atomic_bool config_dirty = ATOMIC_VAR_INIT(false);
 
-static inline char *strdupnull (const char *src)
-{
-    return src ? strdup (src) : NULL;
-}
-
 int config_GetType(const char *name)
 {
     const struct vlc_param *param = vlc_param_Find(name);


=====================================
src/config/file.c
=====================================
@@ -49,11 +49,6 @@
 #include "modules/modules.h"
 #include "misc/rcu.h"
 
-static inline char *strdupnull (const char *src)
-{
-    return src ? strdup (src) : NULL;
-}
-
 /**
  * Get the user's configuration file
  */


=====================================
src/emscripten/netconf.c
=====================================
@@ -22,6 +22,7 @@
 # include "config.h"
 #endif
 #include <vlc_common.h>
+#include <vlc_network.h>
 
 char *vlc_getProxyUrl(const char *url)
 {


=====================================
src/missing.c
=====================================
@@ -102,6 +102,7 @@ noreturn void sout_AnnounceUnRegister(vlc_object_t *obj,
 #undef sout_EncoderCreate
 encoder_t *sout_EncoderCreate( vlc_object_t *p_this, size_t owner_size )
 {
+    (void)owner_size;
     msg_Err (p_this, "Encoding support not compiled-in!");
     return NULL;
 }
@@ -164,15 +165,6 @@ noreturn sout_stream_t *sout_StreamChainNew(vlc_object_t *sout,
     (void) sout; (void) chain; (void) next;
     vlc_assert_unreachable ();
 }
-
-int vlc_sdp_Start (struct vlc_memstream *sdp, vlc_object_t *obj, const char *cfg,
-                     const struct sockaddr *src, size_t srclen,
-                     const struct sockaddr *addr, size_t addrlen)
-{
-    VLC_UNUSED (obj); VLC_UNUSED (cfg); VLC_UNUSED (src); VLC_UNUSED (srclen);
-    VLC_UNUSED (addr); VLC_UNUSED (addrlen);
-    return 0;
-}
 #endif /* !ENABLE_SOUT */
 
 #ifndef ENABLE_VLM


=====================================
src/modules/bank.c
=====================================
@@ -181,7 +181,7 @@ static vlc_plugin_t *module_InitStatic(vlc_plugin_cb entry)
  * at build time. To workaround this, we add -Wl,-U,vlc_static_modules. */
 #if defined(__ELF__) \
     || (defined(__MACH__) && defined(HAVE_DYLIB_DYNAMIC_LOOKUP)) \
-    || !HAVE_DYNAMIC_PLUGINS
+    || !defined(HAVE_DYNAMIC_PLUGINS)
 VLC_WEAK
 extern vlc_plugin_cb vlc_static_modules[];
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/0b82f2d30f3853deb6f17b60a94502b14945a128...bb5bfa7bd2a517e185d72eff7572c9736e025514

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/0b82f2d30f3853deb6f17b60a94502b14945a128...bb5bfa7bd2a517e185d72eff7572c9736e025514
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance