Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

[ffmpeg] / libavformat / mux.c

diff --git a/libavformat/mux.c b/libavformat/mux.c
index ccb1530d78fb97a98e1648fa2182136d9c86ffcf..98ec7a4cf2d600429550d037c0976399fa9f18b2 100644 (file)
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -555,9 +555,15 @@ int ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt,
         st->interleaver_chunk_duration += pkt->duration;
         if (   (s->max_chunk_size && st->interleaver_chunk_size > s->max_chunk_size)
             || (max && st->interleaver_chunk_duration           > max)) {
-            st->interleaver_chunk_size     =
-            st->interleaver_chunk_duration = 0;
+            st->interleaver_chunk_size      = 0;
             this_pktl->pkt.flags |= CHUNK_START;
+            if (max && st->interleaver_chunk_duration > max) {
+                int64_t syncoffset = (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)*max/2;
+                int64_t syncto = av_rescale(pkt->dts + syncoffset, 1, max)*max - syncoffset;
+
+                st->interleaver_chunk_duration += (pkt->dts - syncto)/8 - max;
+            } else
+                st->interleaver_chunk_duration = 0;
         }
     }
     if (*next_point) {