[vlc-commits] [Git][videolan/vlc][master] 3 commits: include: don't include vlc_actions.h from vlc_vout_display.h

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
8e66aa6b by Steve Lhomme at 2023-03-02T09:15:59+00:00
include: don't include vlc_actions.h from vlc_vout_display.h

Nothing from that header is needed in vlc_vout_display.h.

- - - - -
1fbc426b by Steve Lhomme at 2023-03-02T09:15:59+00:00
logger/json: remove unused strings

- - - - -
772080a5 by Steve Lhomme at 2023-03-02T09:15:59+00:00
cpu: explicitely initialize the atomic_uint with a negative value

This is the same value used to compare from fd7857126a2a59bda6ad930461b61fff1114b9d4

- - - - -


4 changed files:

- include/vlc_vout_display.h
- modules/logger/json.c
- modules/video_output/caca.c
- src/misc/cpu.c


Changes:

=====================================
include/vlc_vout_display.h
=====================================
@@ -26,7 +26,6 @@
 #include <vlc_es.h>
 #include <vlc_picture.h>
 #include <vlc_subpicture.h>
-#include <vlc_actions.h>
 #include <vlc_mouse.h>
 #include <vlc_vout.h>
 #include <vlc_window.h>


=====================================
modules/logger/json.c
=====================================
@@ -259,9 +259,6 @@ static const struct vlc_tracer_operations *Open(vlc_object_t *obj,
     return ops;
 }
 
-#define FILE_LOG_TEXT N_("Log to file")
-#define FILE_LOG_LONGTEXT N_("Log all VLC traces to a json file.")
-
 #define LOGFILE_NAME_TEXT N_("Log filename")
 #define LOGFILE_NAME_LONGTEXT N_("Specify the log filename.")
 


=====================================
modules/video_output/caca.c
=====================================
@@ -37,6 +37,7 @@
 #include <vlc_queue.h>
 #include <vlc_plugin.h>
 #include <vlc_vout_display.h>
+#include <vlc_actions.h>
 #if !defined(_WIN32) && !defined(__APPLE__)
 # ifdef X_DISPLAY_MISSING
 #  error Xlib required due to XInitThreads


=====================================
src/misc/cpu.c
=====================================
@@ -191,7 +191,7 @@ out:
 
 unsigned vlc_CPU(void)
 {
-    static atomic_uint cpu_flags = ATOMIC_VAR_INIT(-1);
+    static atomic_uint cpu_flags = ATOMIC_VAR_INIT(-1U);
     unsigned flags = atomic_load_explicit(&cpu_flags, memory_order_relaxed);
 
     if (unlikely(flags == -1U)) {



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/2ff4c82bb869417fb970657590c760219975318f...772080a5d84750d2a3ac9b576eba7a44a98d0e41

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/2ff4c82bb869417fb970657590c760219975318f...772080a5d84750d2a3ac9b576eba7a44a98d0e41
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance