[FFmpeg-cvslog] movenc: Move sidx edit list timestamp adjustment into a block

Martin Storsjö git at videolan.org
Thu Mar 19 13:39:00 CET 2015


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Mon Mar 16 15:08:49 2015 +0200| [5c337353a2546416631a87de4881850d99141c39] | committer: Martin Storsjö

movenc: Move sidx edit list timestamp adjustment into a block

When reading these values from track->frag_info, the same adjustment
has already been done.

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5c337353a2546416631a87de4881850d99141c39
---

 libavformat/movenc.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 85d865e..b6dd456 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -2727,15 +2727,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 */



More information about the ffmpeg-cvslog mailing list