[SCM] libav/experimental: There is no guarantee that every stream will have a start_time found (though it is likely), so check that the start_time is defined before calculating a duration. (patch by neilb suse de)

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:05:39 UTC 2013


The following commit has been merged in the experimental branch:
commit bf494092b03f107e35ab6ad70be324f23a193c2b
Author: Neil Brown <neilb at suse.de>
Date:   Sat Aug 18 00:45:44 2007 +0000

    There is no guarantee that every stream will
    have a start_time found (though it is likely),
    so check that the start_time is defined before
    calculating a duration.
     (patch by neilb suse de)
    
    Originally committed as revision 10138 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 9663a99..0eba3e6 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1551,7 +1551,8 @@ static void av_estimate_timings_from_pts(AVFormatContext *ic, offset_t old_offse
             break;
         read_size += pkt->size;
         st = ic->streams[pkt->stream_index];
-        if (pkt->pts != AV_NOPTS_VALUE) {
+        if (pkt->pts != AV_NOPTS_VALUE &&
+            st->start_time != AV_NOPTS_VALUE) {
             end_time = pkt->pts;
             duration = end_time - st->start_time;
             if (duration > 0) {

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list