[FFmpeg-cvslog] Revert "avformat/mov: Bypass av_add_index_entry()"

Michael Niedermayer git at videolan.org
Mon Mar 2 21:03:02 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  2 20:43:32 2015 +0100| [82fe4072ea4251d47167017b3223928279a5abab] | committer: Michael Niedermayer

Revert "avformat/mov: Bypass av_add_index_entry()"

Next commit will revert the PTS seeking so this is not needed anymore

This reverts commit 38e641a060e0c00930851a8053ca96250b3ecccc.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/mov.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 286f368..33dbdea 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -3218,12 +3218,11 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom)
                                   MOV_FRAG_SAMPLE_FLAG_DEPENDS_YES));
         if (keyframe)
             distance = 0;
-        err = av_add_index_entry(st, offset, INT64_MAX/2, sample_size, distance,
+        err = av_add_index_entry(st, offset, cts, sample_size, distance,
                                  keyframe ? AVINDEX_KEYFRAME : 0);
         if (err < 0) {
             av_log(c->fc, AV_LOG_ERROR, "Failed to add index entry\n");
-        } else
-            st->index_entries[st->nb_index_entries - 1].timestamp = cts;
+        }
         av_dlog(c->fc, "AVIndex stream %d, sample %d, offset %"PRIx64", cts %"PRId64", "
                 "size %d, distance %d, keyframe %d\n", st->index, sc->sample_count+i,
                 offset, cts, sample_size, distance, keyframe);



More information about the ffmpeg-cvslog mailing list