changeset 5636:7309cd6645b6 libavformat

Directly use av_rescale_rnd() instead of av_convert_ts() as this cuts the number of calls to it down by 2.
author michael
date Sun, 07 Feb 2010 19:10:04 +0000
parents c6b8b3403a55
children 37e2c3e635b3
files utils.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/utils.c	Sun Feb 07 16:27:17 2010 +0000
+++ b/utils.c	Sun Feb 07 19:10:04 2010 +0000
@@ -2741,7 +2741,9 @@
 {
     AVStream *st = s->streams[ pkt ->stream_index];
     AVStream *st2= s->streams[ next->stream_index];
-    return av_compare_ts(next->dts, st2->time_base, pkt->dts, st->time_base) > 0;
+    int64_t a= st2->time_base.num * (int64_t)st ->time_base.den;
+    int64_t b= st ->time_base.num * (int64_t)st2->time_base.den;
+    return av_rescale_rnd(pkt->dts, b, a, AV_ROUND_DOWN) < next->dts;
 }
 
 int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush){