From patchwork Mon Sep 6 12:42:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30043 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3722056iov; Mon, 6 Sep 2021 05:44:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJybxpfZYESVaf/73J0g2LD7ciDZoEgdNnfnT/92x1/EBJ/C9ji9h40exP+vQiBldSzo8V/c X-Received: by 2002:aa7:d887:: with SMTP id u7mr13035000edq.366.1630932244152; Mon, 06 Sep 2021 05:44:04 -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 x8si10214149edd.9.2021.09.06.05.44.03; Mon, 06 Sep 2021 05:44:04 -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=TVq4EoZH; 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 ECE3268A605; Mon, 6 Sep 2021 15:43:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2108.outbound.protection.outlook.com [40.92.89.108]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5264768A5F0 for ; Mon, 6 Sep 2021 15:43:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CxU8ZzwFaOiiJBdR2P7m3CfNw/6fkzwiCfviOAPRaGKOiA6PxbAxxn1fgdK3b7S5MsdGQMHGaeD5qcHQdoqGKB/AV/58tpGQlzmnr2sekjJurhBXBF1cXcj24ohHAfjY8wv/jG7/zRsrwxfy2y1FLRJO8wGM9dZE3UcBXPTIfB5MKJtBdQC2KUzZwVC9eeOJwIklouwWK8auFBdf8S1ZyE2KY9CmwlCLwfoQtdWwZ0wpkkVSqi65/NkgEBvC+dmpn0tMkNPQSHo8LMjOh5Qn2rF3o9GCIon0EabwSKYUAfstLUcuE/aV4jsH+CYd2EeW3Qsl88B4CSgB/HP9qruq/w== 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; bh=5tiQED4F8IXdLXHcvhio+3D+TceI9lRo9BIYly1YsiI=; b=EaHq+MFci2ich7YZnfFD5iZkLeZQM7j2t1YR88bU/fIPr/oj34DZeRrXzKkgrOaAm1nBpJRZ8ZPqDxYDzj6RirYMaZseI67wU8I/8dzyUzOqrpowAuQsEPq3ULjFay8zA7kHCv4LXg51/YTexUJMg6swevRIDDamnWFb87SJqiTG78Y1V3n1Gngi5fo7dJS2wTR+7VxLAR78NA6XwPeYcoiVVAYb8JzDKG/PYy3hOI7btdOd8Ehv1D0fc0qDWQ9sZNwZnbSHZj/CZ1cRyrcELMB1XCBDodDvfQeeaNrtMjbUICKkEf8oaLYTURbKsvHQn00KjMB2jobxekvDHOpk1Q== 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=5tiQED4F8IXdLXHcvhio+3D+TceI9lRo9BIYly1YsiI=; b=TVq4EoZHR56nXDdaQ8QhKoqV14wsJ+Hai6sR0kU1JtMQyWpOS7ttuaDbrNddTFaes4kxyYbKGhzeTH6MPom7yEHa65TwjkIL16YFBXQ4a3iYIh2OZhfnnfAXMPg1qH2mTOzY7TPmZj4dFG7U5KmEb8P4gqQ0ASAaW6uFnVkiKyI/MgSHxY1PQ8d75YseIs2xgrGVvHsZ7khOHQxYiqYomBE+45wIGRIxR5fPK2vIXxHHbPMdgWUsfAtCXENWyd/KckR4FU9ry5ktf6q78WOCrPvdxWo9eyEObAg4p1kyTzuQHOjKGXI0lqOWC7WhjHHA+Jjuvp2Hg12tda3lkqJSLQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR0301MB2515.eurprd03.prod.outlook.com (2603:10a6:203:8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Mon, 6 Sep 2021 12:43:17 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4478.025; Mon, 6 Sep 2021 12:43:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 14:42:55 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [byk1PZpwqhUIiGz9Hujz46Odnz3QtEWh] X-ClientProxiedBy: AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906124301.4161498-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Mon, 6 Sep 2021 12:43:17 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fc620c5a-8b1e-4c85-166f-08d97133e68f X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKb3QWS1fMq2gIDvxJlS4pE3u1JUOLHFawEYmObJ5HBWawUY7eZKWpVkAbIENSVoDJ89T47nKm59pilntR14DQ/Khgb0v1uYIZTXQR1O4K7K0k7F/BeOCTq2k3sbZdXH0shTzMTMgYCq5gDxF91T3ED3/4a/e3I6rQy5X2Ce+iKfwvhwUFeDasrC8gbeDumrGr8IpbBjAsAEgtf+b+cym9+OWbQf8A2eF2wyN9bsNlkmQlTH3moNjLIiKeZEuKO2is9Ry25UdGxngE0qoDTYXz6nil1AP9Bk3PwX07GxLKOXxA4NQvMnhSOtPyHxgVjSBNftwjgW4JqOV3J//9z4ROc62GT+2QGUd2mV/sQTpJxVCeNadSncYS6UgUQOzDoFhVCOPJOd4PvQVztPsmVrD6XLFM9BhH+uVRWjDIr4CIFlif7JcIl7XkNfWbTADAKK8OlbI8GJMkV3Y4t+LounOFvIkKjr75f5hCYZ+UNkx2+e1H0DAJSvANfKnSucN6mf6bnzgzwxVZIGeWp4eNXuTKsP/84cQpxheXN9PGPiT7f5tbCI1vhl3csolNavsE3OHcaOTiIqH+gAYIl0PFg7MW76A7f1MHa17tAhDFq0R6nAwfWtQfM+b/IEkzCjfC4pUQ/ozTJQDsRmZwQ52COL+s3ZQMLbfzbINcsKnr3SCGL6UlLrUR1Ow0z9XfFmPpoVSMpV67ATuI+Jg== X-MS-TrafficTypeDiagnostic: AM5PR0301MB2515: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RD7z3Z68E/EgL2xIwrJPhM8Ym5Z5CJnRw2/BBaexSFvpmxHo+v43DdE/BHOCgEMpWJXE0ClhXTBmEIol5FvftsKJWEpfmVLSbYX02Vu6IGYOTSYENRYhomKjYBEn0Kq8cLJgEsAzbLJFkJP8iD80JNAcFBgfqdImSo3UKAVwT7i4jDah9WBW+3D43RwUQ07raIUY9dWJozJ2mFwbvqhHVNiQQjMwqdbLt7M1Wg7YXtGAC9hP+3x+AMTlBaXwhgG8VQdDCe4VqT57DBkufYxqcnoKlrSRiTiQgEwphjiUB6sPt3uvYD1KsYlV23/1PGjlJoxNAZ3mWhogH4WaOg/iFLlluvGP5scIwIwTz+tsUzoHcxWd8SrK4/tchyojEvqWJezE0lQycBiPuL0pwx6cT99H2Q5BHpqRiC8RbEfcqmYAizZPZgYc796gpEKFw+01 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LbzrP06Y2HBILIuAiKP5WY4wZc/IhGCRF27J68JhiUt7aWVbcyR9Nc99kKMRCAeTLyo9vo29UMvBANpmWpTVy8/WXIh3VCPQKNjY1UXZiaGtaPtfT6DWSuKgjljXC/RvToXzcyLRBcgLlORjUgoROw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc620c5a-8b1e-4c85-166f-08d97133e68f X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 12:43:17.7054 (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: AM5PR0301MB2515 Subject: [FFmpeg-devel] [PATCH 05/11] avcodec/mqcenc: Make ff_mqc_flush() static 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: 0ZKSgaAwC92+ Only used as an auxiliary function for ff_mqc_flush_to() since 4624656797b667eb6405186682eb04e74dfd90fd. Signed-off-by: Andreas Rheinhardt --- libavcodec/mqc.h | 1 - libavcodec/mqcenc.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/mqc.h b/libavcodec/mqc.h index ad80fe9228..5e782b05f9 100644 --- a/libavcodec/mqc.h +++ b/libavcodec/mqc.h @@ -55,7 +55,6 @@ void ff_mqc_initenc(MqcState *mqc, uint8_t *bp); void ff_mqc_encode(MqcState *mqc, uint8_t *cxstate, int d); /** flush the encoder [returns number of bytes encoded] */ -int ff_mqc_flush(MqcState *mqc); int ff_mqc_flush_to(MqcState *mqc, uint8_t *dst, int *dst_len); /* decoder */ diff --git a/libavcodec/mqcenc.c b/libavcodec/mqcenc.c index c941f849d9..6d0368f827 100644 --- a/libavcodec/mqcenc.c +++ b/libavcodec/mqcenc.c @@ -102,7 +102,7 @@ void ff_mqc_encode(MqcState *mqc, uint8_t *cxstate, int d) } } -int ff_mqc_flush(MqcState *mqc) +static int mqc_flush(MqcState *mqc) { setbits(mqc); mqc->c = mqc->c << mqc->ct; @@ -120,7 +120,7 @@ int ff_mqc_flush_to(MqcState *mqc, uint8_t *dst, int *dst_len) mqc2.bpstart= mqc2.bp = dst; *mqc2.bp = *mqc->bp; - ff_mqc_flush(&mqc2); + mqc_flush(&mqc2); *dst_len = mqc2.bp - dst; if (mqc->bp < mqc->bpstart) { av_assert1(mqc->bpstart - mqc->bp == 1);