[vlc-commits] [Git][videolan/vlc][master] 4 commits: vout_subpicture: narrow variable scope

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
79b45bb8 by Steve Lhomme at 2025-01-23T12:38:03+00:00
vout_subpicture: narrow variable scope

- - - - -
32000b26 by Steve Lhomme at 2025-01-23T12:38:03+00:00
es_out_timeshift: avoid unnecessary include

- - - - -
7813d93f by Steve Lhomme at 2025-01-23T12:38:03+00:00
bluray: remove bogus comment

We don't use vlc_spu_highlight_t but we need vlc_subpicture.h.

- - - - -
e2090faf by Steve Lhomme at 2025-01-23T12:38:03+00:00
substext: initialize i_next_update

Rather than relying on calloc().

- - - - -


4 changed files:

- modules/access/bluray.c
- modules/codec/substext.h
- src/input/es_out_timeshift.c
- src/video_output/vout_subpictures.c


Changes:

=====================================
modules/access/bluray.c
=====================================
@@ -51,7 +51,7 @@
 #include <vlc_url.h>                        /* vlc_path2uri */
 #include <vlc_iso_lang.h>
 #include <vlc_fs.h>
-#include <vlc_subpicture.h> // vlc_spu_highlight_t
+#include <vlc_subpicture.h>
 
 #include "../demux/mpeg/timestamps.h"
 #include "../demux/timestamps_filter.h"


=====================================
modules/codec/substext.h
=====================================
@@ -319,5 +319,6 @@ static inline subpicture_t *decoder_NewSubpictureText(decoder_t *decoder)
         free(sys);
     }
     sys->region.b_absolute = true;
+    sys->i_next_update = VLC_TICK_INVALID;
     return subpic;
 }


=====================================
src/input/es_out_timeshift.c
=====================================
@@ -43,7 +43,6 @@
 #include <vlc_mouse.h>
 #include <vlc_es_out.h>
 #include <vlc_block.h>
-#include <vlc_subpicture.h> // vlc_spu_highlight_t
 #include "input_internal.h"
 #ifdef _WIN32
 #  include <vlc_charset.h> // FromWide
@@ -707,7 +706,7 @@ static int ControlLocked( es_out_t *p_out, input_source_t *in, int i_query,
     case ES_OUT_SPU_SET_HIGHLIGHT:
     {
         es_out_id_t *p_es = va_arg( args, es_out_id_t * );
-        const vlc_spu_highlight_t *p_hl = va_arg( args, const vlc_spu_highlight_t * );
+        const struct vlc_spu_highlight_t *p_hl = va_arg( args, const struct vlc_spu_highlight_t * );
         return es_out_in_Control( p_sys->p_out, in, ES_OUT_SPU_SET_HIGHLIGHT,
                                   p_es->p_es, p_hl );
     }


=====================================
src/video_output/vout_subpictures.c
=====================================
@@ -1132,8 +1132,6 @@ static struct subpicture_region_rendered *SpuRenderRegion(spu_t *spu,
 
         /* Scale if needed into cache */
         if (!region->p_private) {
-            filter_t *scale = sys->scale;
-
             picture_t *picture = region->p_picture;
             picture_Hold(picture);
 
@@ -1165,6 +1163,7 @@ static struct subpicture_region_rendered *SpuRenderRegion(spu_t *spu,
                  picture->format.i_visible_height != dst_height ||
                  (convert_chroma && !using_palette)))
             {
+                filter_t *scale = sys->scale;
                 scale->fmt_in.video  = picture->format;
                 scale->fmt_out.video = picture->format;
                 if (using_palette)



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/5857e58efdf5aad7c20bbe19be897f2865053174...e2090faf2e2af9ff5fdd71328e06bf1337de77e6

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


VideoLAN code repository instance