From patchwork Thu Sep 30 10:36:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 30691 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp517016iob; Thu, 30 Sep 2021 03:36:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz9Ab6tVdX+JHChHowosw2nMS8Pj3FT8OMPfWSrZjbC3yzrNsFQ7icdLAff+OyxbgjcTCkw X-Received: by 2002:a17:906:d8d7:: with SMTP id re23mr6134075ejb.475.1632998199599; Thu, 30 Sep 2021 03:36:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632998199; cv=none; d=google.com; s=arc-20160816; b=YQ12cR0F/OuXJwZiu5FTAfTwPwgoV63mtlxeqnwQMyaGVpdISdKJ9sOThJCMhhlahr qbcr0wLgVC/6D7baHb4FcuBR2m5mJ4FvNHy4bWU8I8RCIzY0+xdYXzc7xmKRhEECv+8O zTRX4X2J/IBBEkDQqYduLYLIKOARjnpZwhy1NmAR1wFPcfelhjeEJuMdTgGVWNJ5Q9DB sqnHCqqrzDqADxqd9uQWGMHljS6UUlUguUjWXoUg3Hcm3sq74nHF8EYzk03HwNQAQfvU 7eWu5gua0OE7TYfEeflXb6FjFNYSbYQybXvqEmA7dW+G/Rljh6NrrLaBKHGbFK6+eqQR YbIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=dUATA+sbePf5XzOA+/9vS8luY76SVG+ddevJvC+kZrc=; b=h+LlK5JcImVcIANDLeJSZFtIU+iwwSRSb47uHSiACfBRUUnvsPdMajk/k6vaeRfFFy wsJi8m6CA9WKoWzrewGs4SdAX6v/5Uv5dV2OPYX+1dL/mp9RN4g12Z1Dq5XD4G+Ef/N1 H49rfs272EPrtDRuYHhfQV1MK9wnP+iftK7OuFPkRNhF0si8oly7paWBJ6vh3mLT1loB onW1idIjoIbCBlGbpW+vHstrnME7j/NQ0YCgHS8VqV6PLCHY7cX24EtE6RrkuvCvnJEX vauDwTQwYz7QRxwqJNSBIzjwaZ65HE5ppw0wE4cZ5zRkOJKcSGAkYtN5TlgJ7Z9YlMaD L5Vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=pSoZ4eQ1; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gb11si5068493ejc.197.2021.09.30.03.36.35; Thu, 30 Sep 2021 03:36:39 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=pSoZ4eQ1; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 252D268A2C6; Thu, 30 Sep 2021 13:36:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 374B968090E for ; Thu, 30 Sep 2021 13:36:25 +0300 (EEST) Received: by mail-ed1-f44.google.com with SMTP id v10so20415359edj.10 for ; Thu, 30 Sep 2021 03:36:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=dV4Ij+hnoohYX0Ue5Fy8cdwjTJolo6NyVEAKXI5ExPQ=; b=pSoZ4eQ17r4oWf4bzo9Az4XlcL150X2alY8/W9HRT8fStMi6yuqWy9xt4o2PpXu3Gz UmJVxjZks3FluDmDU0aBVdUWqJVS7e8xKsEJZSkju1jaG6w4otrwvZLs7atLOZ4MGV3t Oed4ze+SQr9U7k7HNIorKv34UAKEeWigQROVm0d5WQXqpCgxlB3pn0XfBgL5JFRVL0KX 592PpeYkcHWyCdXKg8XRmuqAuk5uGS/eVRk1GUN4xbDX8zxcNjDx4n9BVxeV+1rJT9Um ulMyPawckrN6VmKACaNNofB5xF/t5xOY6rjtDWyaWs+OYBXxjWd6b+Qzx6lWmI9NWF99 +kkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=dV4Ij+hnoohYX0Ue5Fy8cdwjTJolo6NyVEAKXI5ExPQ=; b=zxOFKZlEctWB2zZjPeKaxAN9P/rKeyNza+75ZFMNHNoRgsu1kQD+/FgD1V92KQ1Ydk 6CZM9+1hcyITB+2MWo1tCrlFuIvXAmro4EvF6hguD7Uz2emL6WupYVtJCBq5OYoIMwgc 39kAeet6W2+9Fzeimv5b+fktIdiQjtqFXB3bXR8onauAncoahIFHNyRg9BJaSXTZImBY iM10b+2lChALPgZPBUa2y6BLlVqNdqmKvg72mPaMRW84qAT1bo0P8559IjnjA0kii6Q6 lcJ3CnR0blpwszBdkNF0OhS+1IjjMReHC40qeuBYQfrDJUnsaVFtFeft63XKZcnjFySO CYew== X-Gm-Message-State: AOAM530FfdGBaQinBZlu8eQ+kXBjqRn/buTImnsLUHOz7aFFewGOUodj 8djBadeCZqPB78nbmHNNbtpox2SBxws= X-Received: by 2002:a17:906:c1d0:: with SMTP id bw16mr6014046ejb.146.1632998184521; Thu, 30 Sep 2021 03:36:24 -0700 (PDT) Received: from localhost.localdomain ([95.168.121.89]) by smtp.gmail.com with ESMTPSA id y1sm1231565edv.79.2021.09.30.03.36.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Sep 2021 03:36:24 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 12:36:17 +0200 Message-Id: <20210930103617.286579-1-onemda@gmail.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mux: fix overflow in case one of dts in not set X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: TvBN22h+fxRm Signed-off-by: Paul B Mahol --- libavformat/mux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index 2053a5636e..583328b123 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -949,7 +949,7 @@ int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, last_dts = av_rescale_q(last->pkt.dts, st->time_base, AV_TIME_BASE_Q); - delta_dts = FFMAX(delta_dts, last_dts - top_dts); + delta_dts = FFMAX(delta_dts, (top_dts == AV_NOPTS_VALUE || last_dts == AV_NOPTS_VALUE) ? 0 : last_dts - top_dts); } if (delta_dts > s->max_interleave_delta) {