[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: demux: mp4: elst can only change if there's one

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch 3.0.x at VideoLAN / VLC


Commits:
25fc2f30 by Francois Cartegnie at 2022-12-25T17:15:20+00:00
demux: mp4: elst can only change if there's one

(cherry picked from commit 0e3d3c060b34a703e68fa3dbfd313bda02067dad)

- - - - -
da33263b by Francois Cartegnie at 2022-12-25T17:15:20+00:00
demux: mp4: do not flag discontinuity after empty edit

refs #26943

(cherry picked from commit 203fb201da9c44bf5d68c937a071f5a8f25fda2f)

- - - - -


1 changed file:

- modules/demux/mp4/mp4.c


Changes:

=====================================
modules/demux/mp4/mp4.c
=====================================
@@ -3979,11 +3979,14 @@ static void MP4_TrackSetELST( demux_t *p_demux, mp4_track_t *tk,
             /* track offset */
             tk->i_elst_time += elst->i_segment_duration[tk->i_elst];
         }
-    }
-    if( i_elst_last != tk->i_elst )
-    {
-        msg_Warn( p_demux, "elst old=%d new=%d", i_elst_last, tk->i_elst );
-        tk->i_next_block_flags |= BLOCK_FLAG_DISCONTINUITY;
+
+        if( i_elst_last != tk->i_elst )
+        {
+            msg_Warn( p_demux, "elst old=%d new=%"PRIu32, i_elst_last, tk->i_elst );
+            if( i_elst_last < elst->i_entry_count &&
+                elst->i_media_time[i_elst_last] >= 0 )
+                tk->i_next_block_flags |= BLOCK_FLAG_DISCONTINUITY;
+        }
     }
 }
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/2def5869420bce69449f45ae5206122899a8f2ca...da33263b12c9814da922234a3734c393c89345fa

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


VideoLAN code repository instance