[FFmpeg-cvslog] avformat/segment: re-interleave packets if needed

Michael Niedermayer git at videolan.org
Thu Jul 24 23:40:58 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul 24 23:22:33 2014 +0200| [66ae994c544a46e4f6915222d8608b3d87b39b07] | committer: Michael Niedermayer

avformat/segment: re-interleave packets if needed

Fixes part of Ticket 3797

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

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

 libavformat/segment.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/segment.c b/libavformat/segment.c
index cae0f11..ce784da 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -766,7 +766,7 @@ static int seg_write_packet(AVFormatContext *s, AVPacket *pkt)
            av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base),
            av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base));
 
-    ret = ff_write_chained(seg->avf, pkt->stream_index, pkt, s, 0);
+    ret = ff_write_chained(seg->avf, pkt->stream_index, pkt, s, seg->initial_offset || seg->reset_timestamps);
 
 fail:
     if (pkt->stream_index == seg->reference_stream_index) {



More information about the ffmpeg-cvslog mailing list