From patchwork Thu Jun 27 17:47:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13732 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id EDE3F449FDF for ; Thu, 27 Jun 2019 20:54:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BF14168AAEB; Thu, 27 Jun 2019 20:54:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2D18468AACB for ; Thu, 27 Jun 2019 20:54:52 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id u8so6516777wmm.1 for ; Thu, 27 Jun 2019 10:54:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tIp8NRXJnMmuwOBQqTEFJ7zeQU76BZflNtY046QQiQ0=; b=SGhcDR+PikX+gzvZBe39W71xI4Iyu2NX3leD1wuLJ3naS8YnXgRxkWYhIV5DMu6VT5 xblGpCNGIy8TF1CzcJR2j17UEjUMtBbnVAv1wHgW71//neDK9yFxLQfxd0EMjZniu1MP tdV50pvA4NprxXfaPgT1Rt31hDVz2r6814I7K/3XLtC856xQpxxmunbACcknc4M4uNse dnJuhgyS5GifoRP3bqti3bJ9v/d+U34L/lqElTLZJ+adMxrsD+sJxBJr1GsG7FRq/Lyl 0cB/0sSEUVCppJ7t/1pEvj/Of1a5TAn8aen+TyOP/oIdXDPJCOylfzmR0PGGoKZRYlQp UnLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tIp8NRXJnMmuwOBQqTEFJ7zeQU76BZflNtY046QQiQ0=; b=ckugG4U1A99FO43vF1Akm+rLaU5EMKA97HfwKuNbQBd29XMjp3Nv+hud6C+a4dl7Mj VNQiYrfM+LFDuw8T4SrXYvgJGY1W8eqnCr1M51PZRgvEpeiF9MLIhhsVuv4GV5WTQjHC eCma24e8xAdMbtxk+IAwXq9aDeT/4fsZLbglFyD1r1h1kVPVvsT6fy0oLZ8LKqQiVM/y 7zqSZAJ2JZ1k8YtQcNpno05zm46tv0nnRfxgmqIPBW5zePlUMgp6pyM1gMx9FChutdvR gAAC60AFv9YXrUOCSjRToQP6+HlUSWABCHWGmBXcoBL7c7lrrKPs8voR0Avp2sJaePT1 nkmQ== X-Gm-Message-State: APjAAAX8/jdDFi8fTKYyBnEgiQfHCBeU3XISEfu3UehZ69yfc5uxdlH2 9pe9b5WMZB1RcDzNl32xqi5HlggN X-Google-Smtp-Source: APXvYqwMYs3CE5nHrckTGZRSEgQs4/qICZa3cjMpCdB1NhAbUudyocDJGpSdDwm1vKM7QibSzzyVsA== X-Received: by 2002:a7b:c347:: with SMTP id l7mr3897055wmj.163.1561657721273; Thu, 27 Jun 2019 10:48:41 -0700 (PDT) Received: from localhost.localdomain (ipbcc063db.dynamic.kabel-deutschland.de. [188.192.99.219]) by smtp.gmail.com with ESMTPSA id z126sm9005429wmb.32.2019.06.27.10.48.40 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 27 Jun 2019 10:48:40 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 27 Jun 2019 19:47:23 +0200 Message-Id: <20190627174723.51998-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavformat/mux: Fix mixed delarations and code X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This commit fixes mixed declarations and code introduced in 1889e316. Signed-off-by: Andreas Rheinhardt --- Sorry for the oversight. libavformat/mux.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index 5e1ecd8485..21f10caf53 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -1005,10 +1005,11 @@ static int interleave_compare_dts(AVFormatContext *s, AVPacket *next, int preload = st ->codecpar->codec_type == AVMEDIA_TYPE_AUDIO; int preload2 = st2->codecpar->codec_type == AVMEDIA_TYPE_AUDIO; if (preload != preload2) { + int64_t ts, ts2; preload *= s->audio_preload; preload2 *= s->audio_preload; - int64_t ts = av_rescale_q(pkt ->dts, st ->time_base, AV_TIME_BASE_Q) - preload; - int64_t ts2= av_rescale_q(next->dts, st2->time_base, AV_TIME_BASE_Q) - preload2; + ts = av_rescale_q(pkt ->dts, st ->time_base, AV_TIME_BASE_Q) - preload; + ts2= av_rescale_q(next->dts, st2->time_base, AV_TIME_BASE_Q) - preload2; if (ts == ts2) { ts = ((uint64_t)pkt ->dts*st ->time_base.num*AV_TIME_BASE - (uint64_t)preload *st ->time_base.den)*st2->time_base.den - ((uint64_t)next->dts*st2->time_base.num*AV_TIME_BASE - (uint64_t)preload2*st2->time_base.den)*st ->time_base.den;