From patchwork Thu Feb 3 18:44:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Theisen X-Patchwork-Id: 34111 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp2742197iov; Thu, 3 Feb 2022 10:47:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJwJQiQSxkngyU0/rvO0Lo1XkmzZKSWajp5Zy5MEtbMh5983Qg7Vl5MzY6u1HFCkxu3tmNT5 X-Received: by 2002:a17:906:e2c4:: with SMTP id gr4mr30600613ejb.393.1643914071979; Thu, 03 Feb 2022 10:47:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643914071; cv=none; d=google.com; s=arc-20160816; b=lkF8s/TxqR/SG+ZbIZI4feLBxpAt7QD/tvHlv+am/7NAkuG2ongtUo0Yn7p8uEevn5 Y+vqf8QiXlaRMwYilfU2D2/k/J5x+eeB5QuDf6Gq5Lp2STbMinmKywE8PeQ3mUgvZKcK CXhh4rgrC6U76e39OY9u2EdL3oYWs5s7d3hBbBNtWOqXdF0tqValxEsl7tLVzWPmmdtV IFPcoRsApjb71ngNLCx7ge98fcuzJSAwvBY64OZqynrkWBdkwmKJ+wzPZb5OdbJ3a3Gz 9bHZoTEvKyNHco+P+zLR0RBGiYoHHTcghgQDP3QTNxc86tEZsZCETXAOytey25+aWHmG R4uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=BRhvjPkB4X8k4aTI0DZrbh45GLneapx21FIurMSYmdQ=; b=nL9fwdLJo1K0R9mpLdKUMRSGLxDfcFCtqgvKrGPY0mctFA+pAfI6JneN5KlQp4zd6z hjY/5fhGEsojyD0x91Km+x3UrU8Y37b/IXmUUp2l+t/a9y1xV9Rls28rN2M6rA58iwkj 4/1zejBXqkZofRFX4+R7Ms8Z6Ss/POf0k3mNKprw8KsMfpw1sDH4Q5v5OsF2xj4qhdQA igcyCA/ox4SQiTeHKnA21YeMUbZII4yYElI7j4GL0gKXqJ3MwfBJsu3o6oFi7mfOCRQ2 RjyxnfU/Jl93HbXTiGpSZmhzVt/Kb5S3SvpeqzM8MHAinFt1G9TcTn8kGGNZ0VVPSfm4 VHCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Y+Bfi1Jv; 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 dd21si11942013ejc.160.2022.02.03.10.47.50; Thu, 03 Feb 2022 10:47:51 -0800 (PST) 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=Y+Bfi1Jv; 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 BD12168B1D6; Thu, 3 Feb 2022 20:45:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f170.google.com (mail-qt1-f170.google.com [209.85.160.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B8ACA68B1A5 for ; Thu, 3 Feb 2022 20:45:37 +0200 (EET) Received: by mail-qt1-f170.google.com with SMTP id t17so3510515qto.1 for ; Thu, 03 Feb 2022 10:45:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pyxGzPGI382WvorQ98CTZqZcEziBz1Sw/t7CIyV7+JM=; b=Y+Bfi1Jv9cZpxt99wgqtmWvpP0s759qH3dixxXkZ1CFItiLKSE0nOz6a7w5+3c1Ykn r3YCEqEdKe704G9jPqP7TG/U7ytFmPl/ZrkT7rWsF99fDYhSK41Kj4bVd+Nfm27yj1rw 4BBqTrIuNCaWLhOX3mNopsL+bKE4tqbtEUKbgm8w30B8nNsdnAx+XdJ7O3pO/9wJpCX0 LVKOl1df0qz787xGJXVRCTYnf/MBThVj8+CKTyOwZuIuNnuwTAOjOQJDKIaZKT6iAObA IBqq5KiExL5febSOMXZnCr4xs/X37X3f9uln76wLwcjoiFNtLcAFO37V1WZBLYuewnNW 3Whg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pyxGzPGI382WvorQ98CTZqZcEziBz1Sw/t7CIyV7+JM=; b=7+Au9+CUctYSnlYbKvXh5PlX7oK/yrAbXQ3CirgZ9tFdm6j7jCnbYXKndTleffcFtf lQyQSrq92n24KCIlKeQzJapk+gKEQHeYPN5iNWjQtp0+60h0l+jAOY2oAgG+oC3JWY04 Q1fjxEHAh01OeE3n50cBDCqkXYHxIsaRJaiz8zEk/qvZn/aMCrXwUDHGL6xx5S0AY4RM 77N3zIngQruL9sW5Entyr1EAfH1oEnwO9D8U56cb9k63Fp9peo+CrD6Vo9R6lthmK773 pRmbIbmUB6MRIygvXdCULRO+LzVGvkzx1Sm6gi6RoPhnVAu3tKPHfrSvMQjGCzSo7jbA MzbQ== X-Gm-Message-State: AOAM530QHOY1oHSZO+6r93AHneecRNO626xfnPXoYcBWd9H6vzDbaMUi /pYLg7DlY+cAU+cGcQF/loWBso7/dYfB6A== X-Received: by 2002:a05:622a:11ca:: with SMTP id n10mr28068114qtk.42.1643913936304; Thu, 03 Feb 2022 10:45:36 -0800 (PST) Received: from localhost.localdomain ([151.200.235.219]) by smtp.gmail.com with ESMTPSA id f16sm5947887qtk.8.2022.02.03.10.45.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Feb 2022 10:45:35 -0800 (PST) From: Scott Theisen To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Feb 2022 13:44:46 -0500 Message-Id: <20220203184450.5491-10-scott.the.elm@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220203184450.5491-1-scott.the.elm@gmail.com> References: <20220201212056.29712-1-scott.the.elm@gmail.com> <20220203184450.5491-1-scott.the.elm@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 09/13] avpriv_find_start_code(): fix indent from previous commit 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 Cc: Scott Theisen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Z6bH0p7pIeZr Whitespace change only. Separate so the previous diff is clearer. --- libavcodec/utils.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index da057bad3e..255c133737 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -956,19 +956,19 @@ const uint8_t *avpriv_find_start_code(const uint8_t *av_restrict p, p += 3; // offset for negative indices in while loop } else { - if (p >= end) - return end; - - // read up to the first three bytes in p to enable reading a start code across - // two (to four) buffers - for (int i = 0; i < 3; i++) { - *start_code <<= 8; - *start_code += *p; - p++; - if (avpriv_start_code_is_valid(*start_code) || p == end) - return p; - } - // p is now properly incremented for the negative indices in the while loop + if (p >= end) + return end; + + // read up to the first three bytes in p to enable reading a start code across + // two (to four) buffers + for (int i = 0; i < 3; i++) { + *start_code <<= 8; + *start_code += *p; + p++; + if (avpriv_start_code_is_valid(*start_code) || p == end) + return p; + } + // p is now properly incremented for the negative indices in the while loop } /* with memory address increasing left to right, we are looking for (in hexadecimal):