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 61E5140B4B for ; Fri, 4 Feb 2022 15:14:51 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D07F068B26D; Fri, 4 Feb 2022 17:14:48 +0200 (EET) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064065.outbound.protection.outlook.com [40.92.64.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6351A68B229 for ; Fri, 4 Feb 2022 17:14:42 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oVUa2o12zj7/EpZaDYzTphYeM8dtIvE82xuhHhoKIWl2CUhh6aEIgTCDIaU2YcGL2s3Jvk09HzCIZpqsp6NhIsNK4G009ogMxSo2FmNw2Ihyh68VcejK4juFVC65IObEu8ArBOxWtBmZ/vnF2msLzY2+5Amq9C4z7nDpaL3eImQfI7ykLP3BugUg37R0EcdG8ITQJWiQvFUdFPgyFkYXN94Pv5IFfLCaQ2nCGV7tPmtsorYmLkyJMJ872y7Eip4NR7gkZV/cXPPL57DBlLSYNCeElDckJ2nuXyCxfqNzft0FyRl35hlD3EyVzwlXgpHPkCCKJSyU7sSkbbtqnBsF5g== 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=Ph/Ym2KcV6TrVHFvxIZb3RsBW4nN+JkI26Lq2/6St7o=; b=oDEzpc0jmhHPhdl4R5h94/pDphnGVooDgRFn+nMbfis0OMYoHqcPu2YuLoXgGIq96M4bX7M5sHNoUmMbs1TAFmHomfdTUS5MCSbXYJUnrYTsEuvo7hHRol40cA2ZLFn2xLFZcbql2eqoDASAvWohiiu2lM7ktTEAI2N9evjXRT8F1nsX62ICvXk/CHL2XumeuBA2ZoGFAr32jKTIeDcykwLM9hKAXwp6nRaNFYgLgIOYRIxlxwpvmsdxZbpSuvBGN72BshKTKu2CQaDAfe8B8FubBV1BTrVjOJXtLx2L7pvNemxNU1okmn6v17XlnOLWFJ5lnKOaYKQCeBZuacPpog== 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=Ph/Ym2KcV6TrVHFvxIZb3RsBW4nN+JkI26Lq2/6St7o=; b=EEo3OB8aiDl+xa0pP1/qMo33VOUdbCTNeTjP5EzNuSE9TvMyfTy8FB+8jAPm5PtRjG6nvxxamJJa+Jp6DB6F2DTMPIKHsCh3n3hzXn3PBz6pSuO9kElyaCgoZgIvxRDt8pBXW1kAbp5j1MS9VUbz1mX8TZocKHYPulrudfDCdj16F1ETX7yK5jPJXoCJ3YYwkGcBfD/7lGd9vUTjqxxdiHpajqyUgB9GGVtAXhvXJ6nE6tcF+Dm6CewzyjU5fdwzQ2Taa3Vx2lqDtC2RCTPBJUezgci2V0ndhoetUMfRLEXpPIb59w0cdG2aaSCKHpQcp0brJ5ED5W66OBy//bpw7w== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB7PR03MB4282.eurprd03.prod.outlook.com (2603:10a6:10:18::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12; Fri, 4 Feb 2022 15:14:40 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4951.014; Fri, 4 Feb 2022 15:14:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Feb 2022 16:14:26 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [00z38SkeQhykC3xe18sNH/d4id8Jktm8] X-ClientProxiedBy: AS9PR06CA0224.eurprd06.prod.outlook.com (2603:10a6:20b:45e::21) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220204151432.2148838-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 66ca2ab4-ec36-4985-979c-08d9e7f110be X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSjtu7sMDnYCqklgc/dtjmmFGVlpQafz+lAsF1MmFcP0DCNfaeTfafWn7P5BAjN5DQHb3KCDqFVbGyzHcBiSk0FnWhim1P4pXXqCejxKfZ9NdMjv7l0bkR4kpGWJ9ud+vdJ3GltgUjho0ZJw3i2LhUgTDg7Oe4TFxj/QoajRE5ld+2cwCuH2WmlED+kZDantcDRbAfsJQcUs1oRx18ocj04Vp7jubyPUdQ410PDHAIlEwrOoiZM2PaRdpBt6x344Ueb+bzFF6TvxDdKtVlC/MwLNCf/QJS4jhu60e2o12dM2Rd/WHp40mtjk2A17wnGOTVqytISrR8dZQ5JGriemJbpL4iFNWahIln3i3W6L+0sVWUojZsbOIJExeG7pE2BAvVEpEq/fG4CyYggb3GaurHYO5TpCAaZodMM3XP4esX0mb2CeCPB8iwQZWcPsmBds+WCLITN0TtA7flrhRPe0vw3+1+DFlXqZnLFAwuP9uCnxzkmvQ3bHo0N+lLPcMY3qchXxZUwxF1cVXP3QTcfC4zfMzX/8gz7SerJoT+GFggzJV8lI9RpgPY+nAlJUnlr9Vmt3cbxxDeIbZ8PHcLpYh4IsEMrbfZfL2E1oEMlHfiPw8ihiklpLWIKj2UXY+PgQbBe+qM3tl7rYIjSRlS8U7pdK3qOm6OX2swv+INaEUNrQnvFc4JWf5iqpD8gnxVgqs7woUVY0PMov1on4+BnVOjTxOo9DcVfg2BU6+Cr4tFi6KpMjmavJhq0TByEaUvfQ84= X-MS-TrafficTypeDiagnostic: DB7PR03MB4282:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sv/bg7GnUzuxX8/PHNQifjxdBq031Rr2oWD6M+DVMd1mfEdee5Ql9xfz7Qc6MzB1RlXbvKgxbTt6FNECQheT8Zr2kaP1FFK+42VON/lcqXt8e2mV0vMtetByarpZHwXM2srwDEj/udygppd0ItsHGtmp/SnQ1Y9LrOgzDGVCHPvl/tHp9kczkyQF/kGhXlqFeH+BAeZ7gP/8Lfwf4g8Cd7UtjXdi0TQBriu1ggw1+/3Xsw8wRCeMQOiEblgXTe+bm6fsV37K1cA4DWNjpRfTiLFLnw9v4Tl2iogj1CkdBG3klUgGPKI3c9m6rO602t6Kk46q50nImuu8quvCCDmtlivyQ6yk8VHh+GESM0m/GIwOykJwUQRkRVtRXdtg73klZzQ5Fjlwj9J4PDqDNV09KM5mrF1zJNII6Cz4V0i9R07sL8iGfipxqDm3s9WXO0FCW6tOIlPKFvbAj5/DkFAi8akB09rc8ZD3KZzTf/0QER9iqEUcalCHSwJSX2jFamQQHA3U0NnMl4ogAgB8IbSdmujfOAW1YppbHP1Y4AwhV03S5Ce+iwbtApA2MrPNjB1pyihOj/C6C1SWvcI2XhZJfA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0o4oQQ/HIUIXuZl7XFBZN+sDVEYcPGzcCKiMFVb+LLCY3Rsa6vtq6RrK4xxq?= =?us-ascii?Q?YGrv27WZvuAcUEnyUf2IvUsn6N9nXLRtWVf4o9bX3nKeFD5/dlvsPmfwbTOB?= =?us-ascii?Q?5jt+biTvfNEVZyJC2GQ3OJQSUXiaOuu5ZiFk+qTTOEJBdw1ZCqmFwbtwTKh6?= =?us-ascii?Q?GBXuMnxf9a9pZhRA8uhCpy7/YBkVaPanIekwKxvRTMic3JIK0IL61fPcO9QM?= =?us-ascii?Q?xsIN6t9o8eN72B+RFVXzCAJWVF77KXxiXDvE7IlnvkdTsJzKR9iGgTRDy++I?= =?us-ascii?Q?j46Bikvbbp+ir4SlrjzrLRtiaXI66OkCMFpYUrXI8/wJWgaFC6z4M5L47+qq?= =?us-ascii?Q?rlltaYgyx2qoVxKcBDzOkZXJzlA2rqYvIRYQMF0b4sDdCtwnRuBNg4AY5d2K?= =?us-ascii?Q?utxEvYCrQf4r6dGnTVCfevhXbky+9+KzrbG6djEKzEGDoxnTGgsDW4v8ufWg?= =?us-ascii?Q?gggzfHtAP7+TKMUqawKCdQ8lLEMc8aty2QdTp5DNRmM/fSD9NN0xKk3t/9g9?= =?us-ascii?Q?iNHvZYobJ9KJ8R0bxrqAcs6euJArxz8GvtYxS71UpWSzVToZTcvSpISKTivR?= =?us-ascii?Q?Ln/xZXGCM73irExnYOWIInHHhVZa7F+rPeLPP8xkUbgWwG/hvpHx3gpAzLXS?= =?us-ascii?Q?1JAALp0d7dAz9Kf6LP0PAc6j3qNWWGCEFJ2uvpT2GBhYSQZ1oYfZklahJiYu?= =?us-ascii?Q?RjnBbMFN2KKixvYbfILdviMMeiD0O4YABLv+ORRKnAJ7rEgUV9Vhz2yxFWl5?= =?us-ascii?Q?obEc+m4Kxz4pzrcHq+5VtkPnzOKGwF6ZUSjG9V9lBqTOnrCW+0rw0W2RNWkV?= =?us-ascii?Q?PeSQz9ZIj42iJnv0z90P+sMaw904FdbuyB2mY7+0idjvGoWnQft1encN630I?= =?us-ascii?Q?zB11LFDoQwcRLyiHLsQfiZXupD1+eFbn/eENjC9q0TqsdiAEBkqykSUb9JgY?= =?us-ascii?Q?6bwr3MBaXU3+4j3afUHrZQ=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 66ca2ab4-ec36-4985-979c-08d9e7f110be X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2022 15:14:40.6821 (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: DB7PR03MB4282 Subject: [FFmpeg-devel] [PATCH 1/7] avcodec/cbs_mpeg2: Remove redundant counter 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 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: Use -1 as the position in ff_cbs_insert_unit_data() which implicitly reuses frag->nb_units as the counter. Also switch to a do-while-loop, as it is more natural than a for-loop now that the counter is gone. Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs_mpeg2.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c index 26400f279f..4395bbf047 100644 --- a/libavcodec/cbs_mpeg2.c +++ b/libavcodec/cbs_mpeg2.c @@ -148,7 +148,8 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx, CodedBitstreamUnitType unit_type; uint32_t start_code = -1; size_t unit_size; - int err, i, final = 0; + int err; + int final = 0; start = avpriv_find_start_code(frag->data, frag->data + frag->data_size, &start_code); @@ -157,7 +158,7 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx, return AVERROR_INVALIDDATA; } - for (i = 0;; i++) { + do { unit_type = start_code & 0xff; if (start == frag->data + frag->data_size) { @@ -185,16 +186,13 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx, final = 1; } - err = ff_cbs_insert_unit_data(frag, i, unit_type, (uint8_t*)start, + err = ff_cbs_insert_unit_data(frag, -1, unit_type, (uint8_t*)start, unit_size, frag->data_ref); if (err < 0) return err; - if (final) - break; - start = end; - } + } while (!final); return 0; } -- 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".