[vlc-commits] [Git][videolan/vlc][master] 4 commits: mux/asf: fix an uninitialized variable use

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
5a17f783 by Steve Lhomme at 2023-07-26T14:38:50+00:00
mux/asf: fix an uninitialized variable use

It should never happen since i_cm_size is only set when there are aspect
ratio values to write. But it's better to silence the warning.

- - - - -
826e03bd by Steve Lhomme at 2023-07-26T14:38:50+00:00
vout: make vout_spuregion_helper standalone

- - - - -
03ecf461 by Steve Lhomme at 2023-07-26T14:38:50+00:00
sout: use the proper type for SOUT_STREAM_ID_SPU_HIGHLIGHT

- - - - -
ad65c058 by Steve Lhomme at 2023-07-26T14:38:50+00:00
avcodec: remove always true ifdef

We need a minimum avcodec of 57.37.100 since 9f7bf69f739112908d60c1ba9160e698b52a8cdd.

- - - - -


7 changed files:

- modules/codec/avcodec/fourcc.c
- modules/mux/asf.c
- modules/stream_out/display.c
- modules/stream_out/duplicate.c
- modules/stream_out/transcode/transcode.c
- src/stream_output/stream_output.c
- src/video_output/vout_spuregion_helper.h


Changes:

=====================================
modules/codec/avcodec/fourcc.c
=====================================
@@ -197,9 +197,7 @@ static const struct vlc_avcodec_fourcc video_codecs[] =
     /* AV_CODEC_ID_V210X */
     { VLC_CODEC_TMV, AV_CODEC_ID_TMV },
     { VLC_CODEC_V210, AV_CODEC_ID_V210 },
-#if LIBAVCODEC_VERSION_CHECK( 54, 50, 100 )
     { VLC_CODEC_VUYA, AV_CODEC_ID_AYUV },
-#endif
     /* AV_CODEC_ID_DPX */
     { VLC_CODEC_MAD, AV_CODEC_ID_MAD },
     { VLC_CODEC_FRWU, AV_CODEC_ID_FRWU },


=====================================
modules/mux/asf.c
=====================================
@@ -985,7 +985,7 @@ static block_t *asf_header_create( sout_mux_t *p_mux, bool b_broadcast )
     /* metadata object (part of header extension) */
     if( i_cm_size )
     {
-        unsigned int i_dst_num, i_dst_den;
+        unsigned int i_dst_num = 0, i_dst_den = 0;
 
         asf_track_t *tk = NULL;
         for( size_t i = 0; i < vlc_array_count( &p_sys->tracks ); i++ )


=====================================
modules/stream_out/display.c
=====================================
@@ -182,7 +182,7 @@ static int Control( sout_stream_t *p_stream, int i_query, va_list args )
         case SOUT_STREAM_ID_SPU_HIGHLIGHT:
         {
             sout_stream_id_sys_t *id = va_arg( args, void * );
-            void *spu_hl = va_arg( args, void * );
+            const vlc_spu_highlight_t *spu_hl = va_arg( args, const vlc_spu_highlight_t * );
             return vlc_input_decoder_SetSpuHighlight( id->dec, spu_hl );
         }
 


=====================================
modules/stream_out/duplicate.c
=====================================
@@ -34,6 +34,7 @@
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>
+#include <vlc_subpicture.h>
 
 /*****************************************************************************
  * Module descriptor
@@ -93,7 +94,7 @@ static int Control( sout_stream_t *p_stream, int i_query, va_list args )
         case SOUT_STREAM_ID_SPU_HIGHLIGHT:
         {
             sout_stream_id_sys_t *id = va_arg(args, void *);
-            void *spu_hl = va_arg(args, void *);
+            const vlc_spu_highlight_t *spu_hl = va_arg(args, const vlc_spu_highlight_t *);
             for( int i = 0; i < id->i_nb_ids; i++ )
             {
                 if( id->pp_ids[i] )


=====================================
modules/stream_out/transcode/transcode.c
=====================================
@@ -364,7 +364,7 @@ static int Control( sout_stream_t *p_stream, int i_query, va_list args )
         case SOUT_STREAM_ID_SPU_HIGHLIGHT:
         {
             sout_stream_id_sys_t *id = (sout_stream_id_sys_t *) va_arg(args, void *);
-            void *spu_hl = va_arg(args, void *);
+            const vlc_spu_highlight_t *spu_hl = va_arg(args, const vlc_spu_highlight_t *);
             if( id->downstream_id )
                 return sout_StreamControl( p_stream->p_next, i_query,
                                            id->downstream_id, spu_hl );


=====================================
src/stream_output/stream_output.c
=====================================
@@ -169,8 +169,9 @@ static int sout_InputControlVa( sout_stream_t *p_sout,
 {
     if( i_query == SOUT_INPUT_SET_SPU_HIGHLIGHT )
     {
+        const vlc_spu_highlight_t *spu_hl = va_arg( args, const vlc_spu_highlight_t * );
         return sout_StreamControl( p_sout, SOUT_STREAM_ID_SPU_HIGHLIGHT,
-                                   p_input->id, va_arg(args, void *) );
+                                   p_input->id, spu_hl );
     }
     return VLC_EGENERIC;
 }


=====================================
src/video_output/vout_spuregion_helper.h
=====================================
@@ -18,6 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #include <vlc_image.h>
+#include <vlc_subpicture.h>
 
 #define RGB2YUV( R, G, B ) \
     ((0.257 * R) + (0.504 * G) + (0.098 * B) + 16), \



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/6f6e71dcaecb49e5ac7a6b72734f81d95d8f0655...ad65c058ddb04a409c412dd56e89fb3109e0f894

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


VideoLAN code repository instance