From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id DC23B40E51 for ; Wed, 9 Feb 2022 03:29:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3332168B149; Wed, 9 Feb 2022 05:29:34 +0200 (EET) Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C75C68019D for ; Wed, 9 Feb 2022 05:29:25 +0200 (EET) Received: by mail-qk1-f179.google.com with SMTP id c189so645250qkg.11 for ; Tue, 08 Feb 2022 19:29:25 -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=saxN9HVlGEV0mlwhCAg8mmes1L9bOuJJdA/TucvEGPk=; b=ZuU8ZHT+fpZOb6E2WVxXs/9PbfeGx/FwVyBXr6SvcSA9aCJ0ShYVXMB9lJIQz0u6XG SEdWwLilyt2BPppVdpwF2jKBSOoVYp4p7xp1uti5w/pZMePNLPA+Q7GH1X2CSX6tl04n lRGwoE8sXfuBc7zz5wj6Mqi8DAEf9CNzvJ3Ft+C/LGbYS7obBgBCMJsQsScpnf4CND21 5101Xl7lQa0w6/o7Xyws4KeSKJU+BIzSIEcsCJI74ZtEh2Hv5dIZ9Az8/x/gEhaBZVyL nKZ0mFyfdbH1m+EZL3u6+TFNT/TTJBw4daN8NHLHN1os5Sez54WhNbLtmMgfYKiBEbxW wjLg== 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=saxN9HVlGEV0mlwhCAg8mmes1L9bOuJJdA/TucvEGPk=; b=ybKq2pUIoM4cOJWlP2RaURjYNlALWPxR+KbkGPx76y3EBqMXNnbyO0Ve9r6ZnIdQCr lF/0RwLoMqToStqzlYW1ENFjK6LXUErWSTRgRxC7HiM6mu7WA0pm4SAGGP/iOBNROp/C EwofNQdYadcotQgU9kpq1kjmt79ziYb5t/rE4cN5rUDUIO/T8J324Ux4lH1dD+/jBn8g 9QnsQUFszBH9mJBikAqwlOP5BPQibxzWLrmJpAX0OyLsC6/mWaAqMi0FByAkjGIc88jw 1DcHUvxhd+5TN6XR6cDvO6YF01ytWfMg8yckiyCvd/QaMBPDmyU+cEhkkTKKU4vVI+K0 mCJQ== X-Gm-Message-State: AOAM531G1wjMdcsYeN90JOODnbltnTvRsKP6FzQzEdcmfsIvakiR6Fzr mcdCTu4ssBc0suRCD6Y/dzkRy+62C3E5Hg== X-Google-Smtp-Source: ABdhPJwjjnNS4TjV31I1vM7sQ2tHZ5k/0POTPWc6DVp0A3zwELv0fD+qNCusn8Y465EE6eHr8a77DQ== X-Received: by 2002:a05:620a:c4d:: with SMTP id u13mr147027qki.29.1644377363885; Tue, 08 Feb 2022 19:29:23 -0800 (PST) Received: from localhost.localdomain ([151.200.235.219]) by smtp.gmail.com with ESMTPSA id o19sm8452524qta.19.2022.02.08.19.29.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Feb 2022 19:29:23 -0800 (PST) From: Scott Theisen To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Feb 2022 22:28:48 -0500 Message-Id: <20220209032854.565698-3-scott.the.elm@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220209032854.565698-1-scott.the.elm@gmail.com> References: <20220201212056.29712-1-scott.the.elm@gmail.com> <20220209032854.565698-1-scott.the.elm@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/8] avpriv_find_start_code(): readability enhancement part 1 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: No functional change. --- libavcodec/utils.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index c7c7323351..42a1885d61 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -963,10 +963,11 @@ const uint8_t *avpriv_find_start_code(const uint8_t *av_restrict p, } } - p = FFMIN(p, end) - 4; - *state = AV_RB32(p); - - return p + 4; + if (p > end) + p = end; + // read the previous 4 bytes, i.e. bytes {p - 4, p - 3, p - 2, p - 1} + *state = AV_RB32(p - 4); + return p; } AVCPBProperties *av_cpb_properties_alloc(size_t *size) -- 2.32.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".