Packman Build Service PMBS

_service:obs_scm:vlc-beta-20220107.fec8b597c7.obscpio/modules/codec/avcodec/avcodec.c -> _service:obs_scm:vlc-beta-20220107.0444c75486.obscpio/modules/codec/avcodec/avcodec.c Changed

@@ -48,6 +48,10 @@
 static const char *const frame_skip_list_text[] =
   { N_("None"), N_("Default"), N_("Non-ref"), N_("Bidir"), N_("Non-key"), N_("All") };
 
+static const int  idct_skip_list[] = { -1, 0, 1, 2, 3, 4 };
+static const char *const idct_skip_list_text[] =
+  { N_("None"), N_("Default"), N_("Non-ref"), N_("Bidir"), N_("Non-key"), N_("All") };
+
 static const int  nloopf_list[] = { 0, 1, 2, 3, 4 };
 static const char *const nloopf_list_text[] =
   { N_("None"), N_("Non-ref"), N_("Bidir"), N_("Non-key"), N_("All") };
@@ -104,7 +108,7 @@
         change_integer_list( frame_skip_list, frame_skip_list_text )
     add_integer( "avcodec-skip-idct", 0, SKIP_IDCT_TEXT,
         SKIP_IDCT_LONGTEXT )
-        change_integer_range( -1, 4 )
+        change_integer_list( idct_skip_list, idct_skip_list_text )
     add_obsolete_integer( "avcodec-vismv" ) /* removed since 3.0.0 */
     add_obsolete_bool( "avcodec-fast" ) /* removed since 4.0.0 */
     add_integer ( "avcodec-skiploopfilter", 0, SKIPLOOPF_TEXT,

_service:obs_scm:vlc-beta-20220107.fec8b597c7.obscpio/modules/codec/avcodec/avcodec.h -> _service:obs_scm:vlc-beta-20220107.0444c75486.obscpio/modules/codec/avcodec/avcodec.h Changed

_service:obs_scm:vlc-beta-20220107.fec8b597c7.obscpio/modules/demux/mp4/mp4.c -> _service:obs_scm:vlc-beta-20220107.0444c75486.obscpio/modules/demux/mp4/mp4.c Changed

@@ -2293,7 +2293,7 @@
         s->psz_name = strdup( BOXDATA(p_chpl)->chapter[i].psz_name );
         if( s->psz_name == NULL)
         {
-            vlc_seekpoint_Delete( s );;
+            vlc_seekpoint_Delete( s );
             continue;
         }
 
@@ -2312,15 +2312,20 @@
         for( unsigned i = 0; i < BOXDATA(p_hmmt)->i_chapter_count; i++ )
         {
             seekpoint_t *s = vlc_seekpoint_New();
-            if( s )
-            {
-                if( asprintf( &s->psz_name, "HiLight tag #%u", i+1 ) != -1 )
-                    EnsureUTF8( s->psz_name );
+            if( s == NULL)
+                continue;
 
-                /* HiLights are stored in ms so we convert them to µs */
-                s->i_time_offset = VLC_TICK_FROM_MS( BOXDATA(p_hmmt)->pi_chapter_start[i] );
-                TAB_APPEND( p_sys->p_title->i_seekpoint, p_sys->p_title->seekpoint, s );
+            if( asprintf( &s->psz_name, "HiLight tag #%u", i+1 ) == -1 )
+            {
+                s->psz_name = NULL;
+                vlc_seekpoint_Delete( s );
+                continue;
             }
+
+            EnsureUTF8( s->psz_name );
+            /* HiLights are stored in ms so we convert them to µs */
+            s->i_time_offset = VLC_TICK_FROM_MS( BOXDATA(p_hmmt)->pi_chapter_start[i] );
+            TAB_APPEND( p_sys->p_title->i_seekpoint, p_sys->p_title->seekpoint, s );
         }
 }
 static void LoadChapterApple( demux_t  *p_demux, mp4_track_t *tk )

_service:obs_scm:vlc-beta.obsinfo Changed

Changes of Revision 147