From patchwork Mon Jan 24 00:57:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Waltman X-Patchwork-Id: 33754 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2317233iog; Sun, 23 Jan 2022 16:58:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJxykk61RRxQXirmEtc02w5yqDGKrSPzpUEBgBzUPd71+h7MjZFDudM351zL97tvzXJucAjQ X-Received: by 2002:a05:6402:270c:: with SMTP id y12mr13828066edd.407.1642985901956; Sun, 23 Jan 2022 16:58:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642985901; cv=none; d=google.com; s=arc-20160816; b=1Ai57wokoV8qa9E1nfg+2vCj4flEvZnN+OcJ1rX1Gsr2SjloLrZl7Ez8B7kQDYN3No NDhZjBDg+6Uq4QM1koJ2vf+jJNdO8jwvD6owDP9yxh7hHEN9683tlu22Sjrl6F9gPN/o O/Mc1VQPgxyIRmsB8033/ixLgMMfIjaGJMm4C2rG0HeT17y9KBf8WT3y0o3D5CZs6eYx bEKl3geMtwn9vVWvoLw9rrgWzisxtHM+3AP0GkZgPF705XpIiLVM+ApEal5125fzMPRE pX244hJPuuVs/KtDZOGWR+NwjkL5WAseASxZ/Pao5u7khN5iGg7JkktmR+/gpRQqFu2k AMIg== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=4FZRNUSgx6ERZgMbl7pyeh/57cAvrBIFUb7Bds98XIM=; b=PpUXWyPbl3Fw6yBn7TPHF/4OTXX23J9IYevj12ECEq9+Q3C3tZg6yyRJs89JiVKqSU J1LfVEmbuNY18h3iAjl1dLen4Kk9McTEnSglyAJbzU5D2/xnarca82ZPVF8PvHl1wDG2 aYlFRIX9GlvTuq6ndL+G53D3YmNsz2Kz8YtiHrDs+r1G5hm9JlvgjZ+YVowdamzHW69W 9DVjUSANKzGr6jroWzhJLxUdQ/Y54QH9qG74Wp0S0bCpBph/85o28a1d516pC3x/gFP7 s5KhvGDzzu7mj2uXbaIC73fmGpUCK8RTPqmATxvR1VbWE8mJfS1BqkiI4aF5fkX+DPNA nOSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@toyon.com header.s=default header.b=rwHwxVzM; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=toyon.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m11si6254215ejl.347.2022.01.23.16.58.21; Sun, 23 Jan 2022 16:58:21 -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=@toyon.com header.s=default header.b=rwHwxVzM; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=toyon.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D5B1468AFA3; Mon, 24 Jan 2022 02:58:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.toyon.com (mail.toyon.com [209.203.101.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EDBBC68ADF8 for ; Mon, 24 Jan 2022 02:58:10 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=toyon.com; s=default; h=From:To:CC:Subject:Date:Message-ID:MIME-Version: Content-Type; bh=S78GtpGJd9zFw6IYAYDk6bDlS5iUSecfzG3CVRrvJgk=; b=rwHwxVzMk3SBM5AkILXfwDrGjoybtnGJyHL4X2+E4zaOxMdp1HnpkVqMvCj/fG ExMf3sFSIkApuN1/MeEDoVFznFpq9xg8Yijn8FrV1eBLe3xMeS5Ev3f0HEWlAEkp 853gJKEoeixz6rj1OKUclOIecSsqkT9E8pqyNMTb9L4To= From: To: Date: Sun, 23 Jan 2022 16:57:56 -0800 Message-ID: <20220124005756.2680-1-jwaltman@toyon.com> X-Mailer: git-send-email 2.18.0.windows.1 MIME-Version: 1.0 X-Originating-IP: [172.21.1.145] X-ClientProxiedBy: mx.toyon.corp (172.17.0.7) To mx.toyon.corp (172.17.0.7) Subject: [FFmpeg-devel] [PATCH] Fix H.264/5 SEI unit ordering (regression from 8843607f) 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: Jon Waltman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: W/HtukDT/L+u From: Jon Waltman --- libavcodec/cbs_sei.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/cbs_sei.c b/libavcodec/cbs_sei.c index 141e97ec58..4a4a58957b 100644 --- a/libavcodec/cbs_sei.c +++ b/libavcodec/cbs_sei.c @@ -154,14 +154,14 @@ static int cbs_sei_get_unit(CodedBitstreamContext *ctx, if (prefix) { // ... before the first VCL NAL unit. for (i = 0; i < au->nb_units; i++) { - if (au->units[i].type < highest_vcl_type) + if (au->units[i].type <= highest_vcl_type) break; } position = i; } else { // ... after the last VCL NAL unit. for (i = au->nb_units - 1; i >= 0; i--) { - if (au->units[i].type < highest_vcl_type) + if (au->units[i].type <= highest_vcl_type) break; } if (i < 0) {