ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Sun Feb 19 00:31:09 2017 +0100| [3206ea4ba31ebf446a3c4f1220adb895b3272c15] | committer: Michael Niedermayer
avformat/utils: Also fill dts==RELATIVE_TS_BASE packets in update_initial_durations() This dts value can end up in the list in the absence of durations and is in that case semantically identical to AV_NOPTS_VALUE. We can alternatively prevent storing RELATIVE_TS_BASE if there is no duration. Fixes Ticket3640 Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3206ea4ba31ebf446a3c4f1220adb895b3272c15 --- libavformat/utils.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 0711310..37d7024 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1164,8 +1164,11 @@ static void update_initial_durations(AVFormatContext *s, AVStream *st, for (; pktl; pktl = get_next_pkt(s, st, pktl)) { if (pktl->pkt.stream_index != stream_index) continue; - if (pktl->pkt.pts == pktl->pkt.dts && - (pktl->pkt.dts == AV_NOPTS_VALUE || pktl->pkt.dts == st->first_dts) && + if ((pktl->pkt.pts == pktl->pkt.dts || + pktl->pkt.pts == AV_NOPTS_VALUE) && + (pktl->pkt.dts == AV_NOPTS_VALUE || + pktl->pkt.dts == st->first_dts || + pktl->pkt.dts == RELATIVE_TS_BASE) && !pktl->pkt.duration) { pktl->pkt.dts = cur_dts; if (!st->internal->avctx->has_b_frames) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
