From 69a96f9d4cf6d5a7f5b568c713b48d78452838fd Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 17 Jan 2013 15:08:50 +0100 Subject: mux: de-obfuscate chunked interleaver checks Signed-off-by: Michael Niedermayer --- libavformat/mux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavformat/mux.c') diff --git a/libavformat/mux.c b/libavformat/mux.c index 0648b3f8c0..ccb1530d78 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -553,8 +553,8 @@ int ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt, uint64_t max= av_rescale_q_rnd(s->max_chunk_duration, AV_TIME_BASE_Q, st->time_base, AV_ROUND_UP); 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) { + 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; this_pktl->pkt.flags |= CHUNK_START; -- cgit v1.2.3