From patchwork Fri May 12 10:56:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Klein X-Patchwork-Id: 41596 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp5296992pzb; Fri, 12 May 2023 03:56:20 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7cRvPp1PqTpIkPUCWbGHCn6mf09BVSjepgLRwJAHm0Y1W4WYAFrD/+Ni28HFS+1xlRLrmE X-Received: by 2002:a17:907:1614:b0:956:f4f8:23b6 with SMTP id hb20-20020a170907161400b00956f4f823b6mr26341364ejc.43.1683888980687; Fri, 12 May 2023 03:56:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683888980; cv=none; d=google.com; s=arc-20160816; b=EZd1ZpTH2eU2/qXnABpj76nps/I/ftd+h/nGi46to5cmoIEU15ZKlTihsc8vSIB1Xc YTOjhoIW1Q3VaBT4wratRK7ed9BhxQjN9fyMefZ+bY3zIq0IbM6xcFV4jb/vuZivwq5O hV32HONC+Qly6dMiqjUms3A7S4rnQUMuy+ry8xMKezbfYaxselyLzr8PWwKKP5CrxSkj 07QQgV2kuWQxOwt8kXFe9khWXXZIASwKIvQoDWgNFJO5Nmla2i5qomfaoo8eTTLB7SJ1 qfi9niS+vleNXWQM790hpfPLZPQhwdZHS8En2nhWN+ms1bFvyINU0XPE8/LUnI0SVcEW 1J3g== 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:ui-outboundreport:to:from:user-agent :mime-version:date:message-id:dkim-signature:delivered-to; bh=anDLuNDrCCxCOJ90ksoiwxTkEsYIdfOPsvqU6rPYijE=; b=j+k9yyDaClHZ2dUalmepco95X3UOf1oZnNqaniug9fCqjxWOUNfTZNMR70D/gDChb4 r8spLgXrROadPrF0TL+o6g5eKK9MTsEnrrcmPfLfWA8VA2YCBUrZY54bzUNrqbRGLHkz MwsoAYkEttDIFq4oRulfd5BYrMQawtrp9cQ8xk2PfRCZKgRsvBEA2XtsZ8/VIUBCrSUx 0qplOeAOytW1xuVohXPFWBtyGsrnksVjhTaZ+y23bPqpjQUJ++arZPOrBEqWXfUuqvhf VwR6pV+96aBqsF26zcsEEu6lX7eAH9zPqVuUtrBrNb5RxLQnog8HyB2UbGnyVVI8JgY4 Wbsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmx.de header.s=s31663417 header.b=ps+vnahN; 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=NONE dis=NONE) header.from=gmx.de Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m9-20020a1709062ac900b00965ab5999c6si6665198eje.93.2023.05.12.03.56.20; Fri, 12 May 2023 03:56:20 -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=@gmx.de header.s=s31663417 header.b=ps+vnahN; 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=NONE dis=NONE) header.from=gmx.de Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 13E3268BF36; Fri, 12 May 2023 13:56:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E71BA68AB9A for ; Fri, 12 May 2023 13:56:10 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1683888969; i=helge_klein@gmx.de; bh=NwnK2NdQfG/B2LQ8+iQSLmdFwLoLvf/rfly7mjvJbic=; h=X-UI-Sender-Class:Date:From:Subject:To; b=ps+vnahNc02TCY1XhcvO7XU5tUqtii54ka04fjSv9uWDjgSTwkQi+ng3CnXK53wwo q80w+v8BY5Aat1lW/JzgG5KUOBoY6pwgWlKSMfwaYTj8WtQzHJSnS9icNP8QgVF9Dm sNHsMp1xyzzmUE7zNNcSiBbz++IDJplC4Q6NfIhm+Kdhs8YwhkhACso3v6KAf113M8 r0PqZ0VvI/RQUS+PCY0JdnltObIqgOhROT7/YAeY4v8euuQ9PAZq+ml+beu7qaMHTw mj0UN7VJj9NWPvdTcVAlR9pJjym8oCVW++PNf7MFwiLeYqnbY7pNhsKQmhvRPfuUr5 MnxSTPIDDivnw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [10.1.9.74] ([62.156.181.34]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1Mf078-1qPaGB31JK-00gVsj for ; Fri, 12 May 2023 12:56:09 +0200 Message-ID: <0eabd803-a3d7-3577-52f6-dfa5822c16b3@gmx.de> Date: Fri, 12 May 2023 12:56:09 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 From: Helge Klein To: ffmpeg-devel@ffmpeg.org X-Provags-ID: V03:K1:iA4cmiYegVIvjW7vCYEwyTGUAEXIA+ZKaYsUY7P/f8JJXpeejad GXOhoquMLs9zUZ7M5h9QQrvcNd5nE7g91xwNWe6kMg5iN8PyqQ/UMTlMWdtRQECW6H6t3OC PajQRbm1bYhpqKUDxuO6IunRuC4rYpzSOgWXjKeQU5h6ThQq1XT6BIeyABco1tdnpqCnxg8 P6QfGbAUqGvWDbyGPO9Hw== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:FFaobK/lJCQ=;qbtth0rVkvip4EfxbnoO2eeHeNq yCgagVZtsYF2pXjIgZD5gkWV2rhWh8cEEFnEqBJO43uAEVB+7hSdxjir9WdJOm6HsIaYAwbik +9SZw5wX5ah+sbQJKaHApCveIKOetzKfmhUwiN0E77QuZKs7+x+jbL3xbMDd1QG/5c9NuL7KA 9zH+bDVIS1MHz41SkJ0f4aFKZTlik6W1wJqTQ0BmiyvWmeIC3NJdDNtdGm8rXot5aTW/h2P1H cH0V5e+uOW270ywBn6h5xYI62LAF3M/2r9Yd4kEuv1s6MmLuaSfzZil/3tpjxNoqVRMFBPnaH C0gWswb+1B7X2t29S8u8S8ANVWx6Q3wiKex5LBVWVlMUHz68jh3I+MVjgrvIu+x2o6XQQHOtV RJPYQU7HVI+bn7+oFRyC8OsEjSYfOkgjePkp/EMRAshIRu/zj+wmMVc6QfP1P4adAfhodmBld LmhYiVZhUtCIy6I25JvR66Vg9Z3S+qFJowbbYKZ6pCBWakBR+TrGgvHs2nrl5CT004Eoh+c8u 84o//egKh2rHTwNqw0HyvDtVNEwRhFjQmytovmoY4Y1bDV7pqM4uhs/E44BwmdoUQklHy2vla YTLTIS60L5og7zNE8PbymjPEC5Vc3eGVmCpSgkiR7jKVM0FvZphRHvQ0d8mlOrvBBuaAMbemp 6+zmke+fF2tjXfZD1a4VOURmJ6p3+3EUyhZHFBXIevbDC1SdrlDS5QEwMxaoaoiZm8COgQc+N zJztIitlCz4Zyt9fKZERV+vN47ZdgvPe5i12FKLGcoUapEWsJVALPmurlE52QurZp5z2BsdL0 aa97s0xEHfGqbBgdGgLnz6iVeHOUUsUMfLkJa6GGS8+34NT5loXaDxPvmfyRlnaEmW4Xy9V5i 2XQAbnzYAtK/caabjT1UANSDUiL8nK2GglQPYHHzND1RRfWrvXD7K0VG5C/q0sKZjvos+/GrN BQluQ7NNxxKEVi8wbUkFyxBA3JE= Subject: [FFmpeg-devel] [PATCH] correct expression of ternary operation. 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: Bl7CAG1eYZ8B Signed-off-by: Helge Klein --- fftools/ffmpeg_opt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -abs_start_seek : -new_start_time; } else if (copy_ts) ifile->ts_offset = 0; -- 2.31.1 diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 7f22b22604..11639e7468 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -228,7 +228,7 @@ static void correct_input_start_times(void) if (copy_ts && start_at_zero) ifile->ts_offset = -new_start_time; else if (!copy_ts) { - abs_start_seek = is->start_time + (ifile->start_time != AV_NOPTS_VALUE) ? ifile->start_time : 0; + abs_start_seek = is->start_time + ((ifile->start_time != AV_NOPTS_VALUE) ? ifile->start_time : 0); ifile->ts_offset = abs_start_seek > new_start_time ?