[SCM] libav/experimental: get rid of some double timebase convertion

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit c0dd7b7c94427f40c43ccf8f4e53eaa36cde2697
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Fri Aug 3 20:49:53 2007 +0000

    get rid of some double timebase convertion
    
    Originally committed as revision 9878 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index 4b57b02..8ec10a2 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;
 

-- 
Libav/FFmpeg packaging