# HG changeset patch # User michael # Date 1265560037 0 # Node ID c6b8b3403a5574b76cedd8a2087cefc18ceced0a # Parent b280788e19366d89344d56bc227530556f18cb6f Use av_compare_ts() for interleaving per dts. diff -r b280788e1936 -r c6b8b3403a55 utils.c --- a/utils.c Sun Feb 07 10:25:58 2010 +0000 +++ b/utils.c Sun Feb 07 16:27:17 2010 +0000 @@ -2741,13 +2741,7 @@ { AVStream *st = s->streams[ pkt ->stream_index]; AVStream *st2= s->streams[ next->stream_index]; - int64_t left = st2->time_base.num * (int64_t)st ->time_base.den; - int64_t right= st ->time_base.num * (int64_t)st2->time_base.den; - - if (pkt->dts == AV_NOPTS_VALUE) - return 0; - - return next->dts * left > pkt->dts * right; //FIXME this can overflow + return av_compare_ts(next->dts, st2->time_base, pkt->dts, st->time_base) > 0; } int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush){