[FFmpeg-cvslog] mux: simplify chunking interleaver code

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 15 23:56:37 2013 +0100| [c57c1329a9958c7eae1c9388fac673f0df53ae13] | committer: Michael Niedermayer

mux: simplify chunking interleaver code

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

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

 libavformat/mux.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/libavformat/mux.c b/libavformat/mux.c
index d939315..0648b3f 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -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;