mux: simplify chunking interleaver code
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 15 Jan 2013 22:56:37 +0000 (23:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Jan 2013 13:45:30 +0000 (14:45 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mux.c

index d939315..0648b3f 100644 (file)
@@ -551,11 +551,10 @@ int ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt,
 
     if (chunked) {
         uint64_t max= av_rescale_q_rnd(s->max_chunk_duration, AV_TIME_BASE_Q, st->time_base, AV_ROUND_UP);
-        if (   st->interleaver_chunk_size     + pkt->size     <= s->max_chunk_size-1U
-            && st->interleaver_chunk_duration + pkt->duration <= max-1U) {
-            st->interleaver_chunk_size     += pkt->size;
-            st->interleaver_chunk_duration += pkt->duration;
-        } else {
+        st->interleaver_chunk_size     += pkt->size;
+        st->interleaver_chunk_duration += pkt->duration;
+        if (   st->interleaver_chunk_size     > s->max_chunk_size-1U
+            || st->interleaver_chunk_duration > max-1U) {
             st->interleaver_chunk_size     =
             st->interleaver_chunk_duration = 0;
             this_pktl->pkt.flags |= CHUNK_START;