From patchwork Wed Jun 5 11:40:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49580 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d792:0:b0:460:55fa:d5ed with SMTP id db18csp324397vqb; Wed, 5 Jun 2024 04:49:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUOV/5EAQ60LXLN7pKGV2+ZSqXpp1mgHMzU8aI6e2OLck7/rmYWkt00EZZSU+CLdGGHzba7lo38Z//wldfzyTp2KXTJCE2J/jRBYw== X-Google-Smtp-Source: AGHT+IGvWQLslnfKIMbZyz3YdLBBkL5c+KdHHbQA+4M7aEOnSCtbMZPFTmitBkra4MilX3RxoFlr X-Received: by 2002:a50:9509:0:b0:57a:3046:1cd8 with SMTP id 4fb4d7f45d1cf-57a8b697867mr1987407a12.7.1717588146924; Wed, 05 Jun 2024 04:49:06 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-57a31cc8e44si6229874a12.638.2024.06.05.04.49.06; Wed, 05 Jun 2024 04:49:06 -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=@outlook.com header.s=selector1 header.b=E8be+siN; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C4BFF68D6F0; Wed, 5 Jun 2024 14:40:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2092.outbound.protection.outlook.com [40.92.50.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C85C768D6C3 for ; Wed, 5 Jun 2024 14:40:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hpk9+b6Gg6+xI3ZcLEHqIExuw+nRG4R3x9OhCRtLNehuX6f7XqMXYF/7sle69vgdWzKkpJz2VgJJ9ryO8pj8akEo0FmAZqigTCJt7PZW9untGCIdyZlIsbhhK8i3kXLQTCoNRCXL1UJNJbgiqFPuaMkfpDgB6umsqcTV18+KMghRCUOfliyI6saAS46HUcvyb5rL6QyPaJslxepKE1y7y+3SGqsPpuw+ojvMW/borkOUjnfAKEhgtqibBSmhyIMRtQwKvmL54fcmnDHr2p5d+Oj6OWlmDN3CkOHKBKZqteNYn+44yZQoIDgxwJGN/Ji+ChsOVCwrXeMbGpyhc0Goiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=y2Pv4UAebV+NRh01n8FHi+c3RX+ugZ/9t+X/Hz0BBmA=; b=fZKvN4hEB+Dx2NqX2h0jRtExohxP1NbWl2OcS9G29tduRKDAy7MZdecE8WwQs/i8UafBnGFm72zKeO9+yRoeXp2weHww5XBLX9ZsXA4VehBj0qKZAzc5Rt7GElXYvREJxrHrweSimt7zj85KIgLw7cSQfp89dQyZmbajxwcGT7wtWyNgT7ejDLYezsvVlsiV7/DRgiBA2p7V6JsW+YQYWD3U7mMrEERlHjhOuniBt16E87u9CalgJtqlhYKoGCtW+we0q8iq2ivR2p3HKaY5Ad4/kY0PN04nJkucOqEfo9DSRU6nSJJygu7YYtQKHVnfxN1jJVEaBEWYTZMgW3k6Yg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=y2Pv4UAebV+NRh01n8FHi+c3RX+ugZ/9t+X/Hz0BBmA=; b=E8be+siNyNsbemIvXs9QLJRLJOjcsl7t4xRHCWjoYAEKNL1Sfs3bde6b1O/uNEnH+ioIFklM/vROInbjPVuwRFY1CzxzLcUfokkDpfyFzysz2n5ZSb6Jt0AkvPt7Nk90/EUl1LuyNhyKS9cfZpsuADYTiqbHC1dpJAvp3RGnUc6DA5AFMlEHtV/c5zasEucnZVjtEOEGHnoztUtbnoHmS61DAqdGKPOlD8E6TmLCJCuK2LRywWibRxpqtQseSaBbeJQeWoZFNMfLqRcmupCcMih62+fK82nZyatRRxRm+TDG/b8BN4nmhhOg8ZW8wvnsnkXbGAPO75HuCUacLlNNBw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0243.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.31; Wed, 5 Jun 2024 11:40:37 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%4]) with mapi id 15.20.7633.021; Wed, 5 Jun 2024 11:40:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jun 2024 13:40:25 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [m5ga0deHg2El0Q2U8qhzwUveiQlCO2AIqmToHd11rAc=] X-ClientProxiedBy: FR4P281CA0420.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:d0::17) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240605114027.1701387-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0243:EE_ X-MS-Office365-Filtering-Correlation-Id: be04e7d9-0d3e-4518-73a8-08dc8554518b X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: caAOIv6XBJoWs8UzHB38+nc3FBQJan5mUBN3cPQ5VvN92spUh1QNiE5VTD3WxmcXvyF9aGmK6eShmD6RfSrfQBMJbv9j7O+8wX/679KZe4Mubx15/qJaiENJRL75gppt0qcJJ2CXL5dvWH79UyW3eo+0lDpA90KYH+J9pAy0NJsbUt/XPQDKyGsJQ2jp3sc1WvqdO9QjMd3sKTAUF9t0oMxcIgKhEac4NQYEg4chMPeEagaGiUX3cxkQi3QsNpo/mCgd7YWXvmk8B2wS0WBw5i3w2rjP1t0nOENlyAbe2WVjBw12YKUaBgt23ndjDj3n9N1/p3GqBOJbqr8buLCELKCIjnzkMiBIyOe2XCqZwLZdRYvZqPtWK3apayifYLdKCh4eLy9Mk8/bWXHR6ZhOhcgKPXBCBQXZLNjfpnZkTPSk+6MAM92kf6usfgtGRWAbNFeRE2pR1ijOAUxxCseBM7/zC3KJqHuKy81y2AU16mKNpOts/GsZCkmUPq1KVFXNIP4FoC8vIYypwAfj3/sE7rFE1VoOxqI7WJmUam+hgeQr6LdltMkEFjXCD7f6PUVqoqtBGqR8ylvNuIXv2XFgUqdY/PmoPj2RVF2IGfrtswNSry0hTz63PYHLslnulQXR X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: icek2/PYyMdsyQjcBMkrqsFrwlskBE4Wo0iV7GIkI/0yHHvfRoB4pRvoEH6A/iSxQxYFSJRlPacXCYBUsQplWHGUuymj1T3WJS7iHDCup7tj6cWEoYURKclrqsM2JSb/sXVLSDQcr7VcZe6Tjxd4Ncl67Ci7elpYlBfNTx90W3EmV6g5i1IAeSxYSyCkoR8no+VbXWsO4iMveMo0xZZa36hRPRRYKY+IjDG42+0FiGIv/lbDJDsM2eOz71vziaHkGYGjQe9GOdeVdQEqILDEvIRdJJjRzIUwn1czJVnc2BUsqmE1Du2+Zc6mXd+j7baVOTDm1Tpz7KAMJDQtglF1XqV8ozunWViVoDpycjmjqO8q3O7xCM1kPdH/U4+PU10qfl/BsFMoK6psUEx58XqkY9j6NfeuWTBB7YuOBxWqRQ/sgm5XOWxIhKsuradb6zKTb7Zso9T6OuXG0llgddW346H5KLLmmS+euNq49ICqFWSmzSaAcg5Vj8DTp/FdKHH0Cy7XFaf995+rwqf0De1IkzYd1QG9qM05sCoN71CUhQR9BVUxi5U54+pxv0mA5bP1P1KlQ35Y+oFZuxlKYg2GcrsSGSlhbbZ9ZYKhvRu9kysJtHbQWHnQwXmQEWD/z9gtKxIleVNBoQTMXDQHwo85R+EosFEIa5Kcp4MuvvuN3eYYuOQwrA9y+CtXqNPmp7bFw2uGgiRlEhhA1qUt0bW7p2ECaxBQ22/2u35EWXRTbKuqT1EHwnHxJ3fFRVDFVWC1TzLBsRom1hPWUHy11CKHlgTERXO/NEuIJTlzvZSVO+5rOPLIfP9+6M7CxrICOsSwpD/C+82LyBdryCf3VTleVBpqkv5XOV/na4vChh4lmcbO1wKqOSTD+v09lEQQ6X4do6UJlijZWmbgSwX40OkpUhXvmxzaBYBRbXfmO7EQe0eABxutrdOOeytwK0Ur62rB0YFTZO5ocyXMD0fHvKa/PzUchvISJhzyx6dr36pNQTX4TZdSnhc+AWaXiieferXoboW8w8DjpCHVw+ewS53GfKhI53ycb4SIrPKPA5VsIVwo8sM7XNAvfThxohKmwWKgwclA8ulrGv6U9plTnILgowEuvz1Fm2P7obQaFjtD1usjPWG7z8j5ZgIxTsclEUuQDb44rXVrkbRtAxxZ0sl+hvJiFm20qeIhUmvDLyYPKywXK05OVhJkV2lt3NUYexsU8foQFy8LzzAjh37y7F2bZ6osjVIiBJeH0spSJhCdsr/hyieYbpx9c+n+NZXhCD/1IVsrw0yj0/a8fb/zHt+FEw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: be04e7d9-0d3e-4518-73a8-08dc8554518b X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2024 11:40:37.4019 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3P250MB0243 Subject: [FFmpeg-devel] [PATCH 5/7] avformat/vvc: Reindent after the 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +bgnm5YzNKAC Signed-off-by: Andreas Rheinhardt --- libavformat/vvc.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libavformat/vvc.c b/libavformat/vvc.c index 819ee02e2c..3821de7812 100644 --- a/libavformat/vvc.c +++ b/libavformat/vvc.c @@ -527,17 +527,17 @@ static int vvcc_add_nal_unit(uint8_t *nal_buf, uint32_t nal_size, if (vvcc->arrays[array_idx].num_nalus == 1) vvcc->num_of_arrays++; - if (nal_type == VVC_VPS_NUT) - ret = vvcc_parse_vps(&gbc, vvcc); - else if (nal_type == VVC_SPS_NUT) - ret = vvcc_parse_sps(&gbc, vvcc); - else if (nal_type == VVC_PPS_NUT) - ret = vvcc_parse_pps(&gbc, vvcc); - else if (nal_type == VVC_OPI_NUT) { - // not yet supported - } - if (ret < 0) - goto end; + if (nal_type == VVC_VPS_NUT) + ret = vvcc_parse_vps(&gbc, vvcc); + else if (nal_type == VVC_SPS_NUT) + ret = vvcc_parse_sps(&gbc, vvcc); + else if (nal_type == VVC_PPS_NUT) + ret = vvcc_parse_pps(&gbc, vvcc); + else if (nal_type == VVC_OPI_NUT) { + // not yet supported + } + if (ret < 0) + goto end; end: av_free(rbsp_buf);