Changes of Revision 147

_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
x
 
1
@@ -48,6 +48,10 @@
2
 static const char *const frame_skip_list_text[] =
3
   { N_("None"), N_("Default"), N_("Non-ref"), N_("Bidir"), N_("Non-key"), N_("All") };
4
 
5
+static const int  idct_skip_list[] = { -1, 0, 1, 2, 3, 4 };
6
+static const char *const idct_skip_list_text[] =
7
+  { N_("None"), N_("Default"), N_("Non-ref"), N_("Bidir"), N_("Non-key"), N_("All") };
8
+
9
 static const int  nloopf_list[] = { 0, 1, 2, 3, 4 };
10
 static const char *const nloopf_list_text[] =
11
   { N_("None"), N_("Non-ref"), N_("Bidir"), N_("Non-key"), N_("All") };
12
@@ -104,7 +108,7 @@
13
         change_integer_list( frame_skip_list, frame_skip_list_text )
14
     add_integer( "avcodec-skip-idct", 0, SKIP_IDCT_TEXT,
15
         SKIP_IDCT_LONGTEXT )
16
-        change_integer_range( -1, 4 )
17
+        change_integer_list( idct_skip_list, idct_skip_list_text )
18
     add_obsolete_integer( "avcodec-vismv" ) /* removed since 3.0.0 */
19
     add_obsolete_bool( "avcodec-fast" ) /* removed since 4.0.0 */
20
     add_integer ( "avcodec-skiploopfilter", 0, SKIPLOOPF_TEXT,
21
_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
11
 
1
@@ -91,8 +91,7 @@
2
 
3
 #define SKIP_IDCT_TEXT N_("Skip idct (default=0)")
4
 #define SKIP_IDCT_LONGTEXT N_( \
5
-    "Force skipping of idct to speed up decoding for frame types " \
6
-    "(-1=None, 0=Default, 1=B-frames, 2=P-frames, 3=B+P frames, 4=all frames)." )
7
+    "Force skipping of idct to speed up decoding for frame types." )
8
 
9
 #define DEBUG_TEXT N_( "Debug mask" )
10
 #define DEBUG_LONGTEXT NULL
11
_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
38
 
1
@@ -2293,7 +2293,7 @@
2
         s->psz_name = strdup( BOXDATA(p_chpl)->chapter[i].psz_name );
3
         if( s->psz_name == NULL)
4
         {
5
-            vlc_seekpoint_Delete( s );;
6
+            vlc_seekpoint_Delete( s );
7
             continue;
8
         }
9
 
10
@@ -2312,15 +2312,20 @@
11
         for( unsigned i = 0; i < BOXDATA(p_hmmt)->i_chapter_count; i++ )
12
         {
13
             seekpoint_t *s = vlc_seekpoint_New();
14
-            if( s )
15
-            {
16
-                if( asprintf( &s->psz_name, "HiLight tag #%u", i+1 ) != -1 )
17
-                    EnsureUTF8( s->psz_name );
18
+            if( s == NULL)
19
+                continue;
20
 
21
-                /* HiLights are stored in ms so we convert them to µs */
22
-                s->i_time_offset = VLC_TICK_FROM_MS( BOXDATA(p_hmmt)->pi_chapter_start[i] );
23
-                TAB_APPEND( p_sys->p_title->i_seekpoint, p_sys->p_title->seekpoint, s );
24
+            if( asprintf( &s->psz_name, "HiLight tag #%u", i+1 ) == -1 )
25
+            {
26
+                s->psz_name = NULL;
27
+                vlc_seekpoint_Delete( s );
28
+                continue;
29
             }
30
+
31
+            EnsureUTF8( s->psz_name );
32
+            /* HiLights are stored in ms so we convert them to µs */
33
+            s->i_time_offset = VLC_TICK_FROM_MS( BOXDATA(p_hmmt)->pi_chapter_start[i] );
34
+            TAB_APPEND( p_sys->p_title->i_seekpoint, p_sys->p_title->seekpoint, s );
35
         }
36
 }
37
 static void LoadChapterApple( demux_t  *p_demux, mp4_track_t *tk )
38
_service:obs_scm:vlc-beta.obsinfo Changed
10
 
1
@@ -1,5 +1,5 @@
2
 name: vlc-beta
3
-version: 20220107.fec8b597c7
4
-mtime: 1641538108
5
-commit: fec8b597c7abfb2838e07d38364a60a62b90142a
6
+version: 20220107.0444c75486
7
+mtime: 1641540984
8
+commit: 0444c75486589a7952bfea86e2b3ba5099cd5ea8
9
 
10