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 18E19403E3 for ; Mon, 24 Jan 2022 01:37:22 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E5F2268AFB3; Mon, 24 Jan 2022 03:37:19 +0200 (EET) Received: from mail.toyon.com (mail.toyon.com [209.203.101.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C3E8268AECE for ; Mon, 24 Jan 2022 03:37:12 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=toyon.com; s=default; h=From:To:Subject:Thread-Topic:Thread-Index:Date: Message-ID:Accept-Language:Content-Language:Content-Type: Content-Transfer-Encoding:MIME-Version; bh=DzIFpc4CIt60JkHKAxnAc 47srUCeu2SvI4YTQZexz1g=; b=eE9rmwBj1lzEMAFNV2bAD8BGHmhuXdKS206CO oRBA6FcO65MmM0dcBkgGkxUr7HOuKSbAAmk9oIAvEJm2G9dp8MLdHSiV66IvzSnu 7Daz2FiRJtcZALTzWpD4GqEuq0XPHwuTXRX9z3fqmVWL0q3JTdSqve7HZbCmCC2z 61SVxw= From: Jon Waltman To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] lavc/cbs_sei: Fix H.264/5 SEI unit ordering Thread-Index: AdgQt0M0amYiylM1RR+Wbrovz+xdAw== Date: Mon, 24 Jan 2022 01:37:07 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [172.21.1.145] MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/cbs_sei: Fix H.264/5 SEI unit ordering 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 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: Fixes regression from commit 8843607f495c95c1e67a3ce3d6f15dca6e252439 causing incorrect SEI unit ordering (e.g. after H264_NAL_IDR_SLICE when prefix is specified). Signed-off-by: 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) { -- 2.25.1 _______________________________________________ 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".