[vlc-commits] [Git][videolan/vlc][master] 2 commits: access: dvd: share the signature of shared functions/structures

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
3eac3471 by Steve Lhomme at 2026-06-23T12:24:47+00:00
access: dvd: share the signature of shared functions/structures

So they are always in sync.

- - - - -
a83a803d by Steve Lhomme at 2026-06-23T12:24:47+00:00
access: dvd: ensure we don't have a language set by default

Otherwise we leak it.

- - - - -


4 changed files:

- modules/access/dvdnav.c
- modules/access/dvdread.c
- modules/access/dvdread.h
- modules/access/dvdread_video.c


Changes:

=====================================
modules/access/dvdnav.c
=====================================
@@ -1697,6 +1697,7 @@ static void ESNew( demux_t *p_demux, int i_id )
         }
     }
 
+    assert( tk->fmt.psz_language == NULL );
     if( i_lang != 0xffff )
     {
         tk->fmt.psz_language = malloc( 3 );


=====================================
modules/access/dvdread.c
=====================================
@@ -49,16 +49,6 @@
 #include <vlc_charset.h>
 #include "disc_helper.h"
 
-extern const dvdread_ops_t DvdReadVideoOps;
-extern void DvdReadHandleDSI( demux_t *, uint8_t * );
-void DvdReadESNew( demux_t *, int, int );
-
-#ifdef DVDREAD_HAS_DVDVIDEORECORDING
-extern const dvdread_ops_t DvdVRReadOps;
-#endif
-#ifdef DVDREAD_HAS_DVDAUDIO
-extern const dvdread_ops_t DvdAudioReadOps;
-#endif
 
 /*****************************************************************************
  * Module descriptor
@@ -946,6 +936,7 @@ void DvdReadESNew( demux_t *p_demux, int i_id, int i_lang )
     }
 
     /* Add a new ES */
+    assert( tk->fmt.psz_language == NULL );
     if( tk->fmt.i_cat == VIDEO_ES )
     {
         tk->fmt.video.i_sar_num = p_sys->i_sar_num;


=====================================
modules/access/dvdread.h
=====================================
@@ -190,4 +190,15 @@ int OpenAudio( vlc_object_t * );
 uint32_t   DvdVRGetProgramSectorSpan( const demux_sys_t *, const vobu_map_t * );
 #endif
 
+void DvdReadESNew( demux_t *p_demux, int i_id, int i_lang );
+void DvdReadHandleDSI( demux_t *p_demux, uint8_t *p_data );
+
+extern const dvdread_ops_t DvdReadVideoOps;
+#ifdef DVDREAD_HAS_DVDAUDIO
+extern const dvdread_ops_t DvdAudioReadOps;
+#endif
+#ifdef DVDREAD_HAS_DVDVIDEORECORDING
+extern const dvdread_ops_t DvdVRReadOps;
+#endif
+
 #endif /* VLC_ACCESS_DVDREAD_H */


=====================================
modules/access/dvdread_video.c
=====================================
@@ -30,9 +30,6 @@
 #include <limits.h>
 #include <vlc_arrays.h>
 
-extern void DvdReadESNew( demux_t *, int, int );
-void DvdReadHandleDSI( demux_t *, uint8_t * );
-
 static vlc_tick_t dvdtime_to_time( const dvd_time_t *dtime )
 {
 /* Macro to convert Binary Coded Decimal to Decimal */



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/35f4ec31b217f659f618c70020244e636c41e4e6...a83a803dc3a0e1dbf7a11dc237653e03533fa3af

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/35f4ec31b217f659f618c70020244e636c41e4e6...a83a803dc3a0e1dbf7a11dc237653e03533fa3af
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help