[SCM] libav/experimental: Fix -ss / -t interaction with -acodec copy. Fixes issue203

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit cdf38a17fbd8da972dce80e4a00992d42f0ac64c
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Thu Apr 9 00:13:59 2009 +0000

    Fix -ss / -t interaction with -acodec copy.
    Fixes issue203
    
    Originally committed as revision 18382 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index cb15120..700d75f 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1364,6 +1364,8 @@ static int output_packet(AVInputStream *ist, int ist_index,
                     } else {
                         AVFrame avframe; //FIXME/XXX remove this
                         AVPacket opkt;
+                        int64_t ost_tb_start_time= av_rescale_q(start_time, AV_TIME_BASE_Q, ost->st->time_base);
+
                         av_init_packet(&opkt);
 
                         if ((!ost->frame_number && !(pkt->flags & PKT_FLAG_KEY)) && !copy_initial_nonkeyframes)
@@ -1385,7 +1387,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
 
                         opkt.stream_index= ost->index;
                         if(pkt->pts != AV_NOPTS_VALUE)
-                            opkt.pts= av_rescale_q(pkt->pts, ist->st->time_base, ost->st->time_base);
+                            opkt.pts= av_rescale_q(pkt->pts, ist->st->time_base, ost->st->time_base) - ost_tb_start_time;
                         else
                             opkt.pts= AV_NOPTS_VALUE;
 
@@ -1393,6 +1395,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
                             opkt.dts = av_rescale_q(ist->pts, AV_TIME_BASE_Q, ost->st->time_base);
                         else
                             opkt.dts = av_rescale_q(pkt->dts, ist->st->time_base, ost->st->time_base);
+                        opkt.dts -= ost_tb_start_time;
 
                         opkt.duration = av_rescale_q(pkt->duration, ist->st->time_base, ost->st->time_base);
                         opkt.flags= pkt->flags;

-- 
Libav/FFmpeg packaging