[FFmpeg-cvslog] ffmpeg: use av_rescale_delta() for audio stream copy

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 27 03:18:09 2012 +0200| [1909dbf11da01f4493d9183622ef9feb3632257e] | committer: Michael Niedermayer

ffmpeg: use av_rescale_delta() for audio stream copy

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1909dbf11da01f4493d9183622ef9feb3632257e
---

 ffmpeg.c |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ffmpeg.c b/ffmpeg.c
index f2d0b67..37b6311 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1360,6 +1360,15 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p
         opkt.dts = av_rescale_q(pkt->dts, ist->st->time_base, ost->st->time_base);
     opkt.dts -= ost_tb_start_time;
 
+    if (ost->st->codec->codec_type == AVMEDIA_TYPE_AUDIO && pkt->dts != AV_NOPTS_VALUE) {
+        int duration = av_get_audio_frame_duration(ist->st->codec, pkt->size);
+        if(!duration)
+            duration = ist->st->codec->frame_size;
+        opkt.dts = opkt.pts = av_rescale_delta(ist->st->time_base, pkt->dts,
+                                               (AVRational){1, ist->st->codec->sample_rate}, duration, &ist->filter_in_rescale_delta_last,
+                                               ost->st->time_base);
+    }
+
     opkt.duration = av_rescale_q(pkt->duration, ist->st->time_base, ost->st->time_base);
     opkt.flags    = pkt->flags;