Merge commit '5c337353a2546416631a87de4881850d99141c39'

* commit '5c337353a2546416631a87de4881850d99141c39':
  movenc: Move sidx edit list timestamp adjustment into a block

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavformat/movenc.c

@@ -3652,15 +3652,15 @@ static int mov_write_sidx_tag(AVIOContext *pb,
         duration = track->start_dts + track->track_duration -
                    track->cluster[0].dts;
         starts_with_SAP = track->cluster[0].flags & MOV_SYNC_SAMPLE;
+
+        // pts<0 should be cut away using edts
+        if (presentation_time < 0)
+            presentation_time = 0;
     } else {
         entries = track->nb_frag_info;
         presentation_time = track->frag_info[0].time;
     }
 
-    // pts<0 should be cut away using edts
-    if (presentation_time < 0)
-        presentation_time = 0;
-
     avio_wb32(pb, 0); /* size */
     ffio_wfourcc(pb, "sidx");
     avio_w8(pb, 1); /* version */