From c0dd7b7c94427f40c43ccf8f4e53eaa36cde2697 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 3 Aug 2007 20:49:53 +0000 Subject: get rid of some double timebase convertion Originally committed as revision 9878 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'ffmpeg.c') diff --git a/ffmpeg.c b/ffmpeg.c index 4b57b0218b..8ec10a2f43 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1230,14 +1230,11 @@ static int output_packet(AVInputStream *ist, int ist_index, else opkt.pts= AV_NOPTS_VALUE; - { - int64_t dts; if (pkt->dts == AV_NOPTS_VALUE) - dts = ist->next_pts; + opkt.dts = av_rescale_q(ist->next_pts, AV_TIME_BASE_Q, ost->st->time_base); else - dts= av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q); - opkt.dts= av_rescale_q(dts, AV_TIME_BASE_Q, ost->st->time_base); - } + opkt.dts = av_rescale_q(pkt->dts, ist->st->time_base, ost->st->time_base); + opkt.duration = av_rescale_q(pkt->duration, ist->st->time_base, ost->st->time_base); opkt.flags= pkt->flags; -- cgit v1.2.3