From patchwork Thu Apr 15 02:02:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26916 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 8AA7244A0C1 for ; Thu, 15 Apr 2021 05:03:18 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5E65A68A329; Thu, 15 Apr 2021 05:03:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066011.outbound.protection.outlook.com [40.92.66.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 103EF689D2E for ; Thu, 15 Apr 2021 05:03:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cq6tZfTxQw3gJsR/pzXXTnREPpm9fsihVA/GKCVokUbN+SYtOQAIgMmJTGcx5LM8y6fH4ntkkq6Y++wwRFEVlabpXDonsHWx0lYy8GR1lBmGxx22JTUzW3xHC+Xkds4fJ3NKidzJ87OAH0TMLhTwli24dPyMGjQRNrAzKiPncUvwn3Z9R04JdidIgPQyXX/x3GsjOwK8kjlQaupP4mJCS00kL6HuRrT2pD3Wa4huJ/CBXpDB2r3AVs/8u+UTnyiakrEgANRfruX2RCl8e+dn3g8ZQK16gdOriLuVP/5HfCv/PfjaJXuRAtLzs9G4xCfEc9ah8A2pfT3Bz5TfCvFwuA== 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-SenderADCheck; bh=1YrNASzxr5zDd1xKZpQHZEQv6EYpQGY37hfV5b6SArk=; b=KS0cMG2d+sdihd8BNjrqthbP9zGDH0X0nSxNfezX9GVJNJPTvXpOQMDPYFkTXQ7En6dDsE6u6nMBRcbMDmpsvgm4QraDJj3N56gj5ppox0yEPw9+Zx9bouSEIFMASkb7hX1eMrs0jaNaB0UME7c3FRmN4Nv/LXrAgEzLeX6GnkvTky1U3dBYBPxNrSG+3nfejbULSqY+nfWAHwF9Z6B+nVzoM+/1fau2tGRSNdqV7p4GU1oGzFJQgh7hiJEQ81PXf1lKSEM9hlXTe0JUYpiTuVUhUb2HQafCdd+bji2rv8U18vK46rAExzfFfUlOzjYRFKZ23cHdHyKGkvVLcLB49w== 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=1YrNASzxr5zDd1xKZpQHZEQv6EYpQGY37hfV5b6SArk=; b=Z+v6R4mhP60dJzdjhYoVU9uQdYwKRRye/RZ13SB1G7RHHMJ1v1XE8natX+hHD1eVRvLD9is1OA4tC8DF19cw8o4cGzYgXXCs8+9I1BTHswJZJZMtH1quXGSrBtTDlXGLhl8Djbit7SXoqhJ/d4T+3OGDi6ytN7Lt7PP5Bmw6gr0iPhC+7mPq8SusSSVPzs6vbWOzPgxVnJz6/mrigyFjNXyGjGlo5hrpIsoUVP80dYKYzl3AVy84JnIIaoJB9Tohz+nNhto8DQWvIV9i8VmkO+QK3ueo6g5dsHLEGkrzS74kRNGaDztrM41uiYNYM00ELi8ayNx4Zo7KK7+HTQywjA== Received: from DB5EUR01FT021.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e1a::48) by DB5EUR01HT101.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e1a::449) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16; Thu, 15 Apr 2021 02:03:10 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1a::42) by DB5EUR01FT021.mail.protection.outlook.com (2a01:111:e400:7e1a::245) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Thu, 15 Apr 2021 02:03:10 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:4ED6A781D918D2145A099C5B8A937DF111F53377C4667F454FA811CE907DF9D5; UpperCasedChecksum:85406B26660E4858ADC40CA6C84ACF66C11D3D06E5EEA411056F9FCF65E9F4D7; SizeAsReceived:7399; Count:46 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4042.018; Thu, 15 Apr 2021 02:02:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Apr 2021 04:02:35 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 X-TMN: [P7UpnhKD/cEv5ngSZH9DKvtF7frvbIwy] X-ClientProxiedBy: PR0P264CA0100.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::16) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210415020239.1410801-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by PR0P264CA0100.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Thu, 15 Apr 2021 02:02:51 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 2292f707-7383-4e5a-da06-08d8ffb29348 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTEEqEyiKFNUcsVK4T7qzgRjnA9VFaK/eqZVwmzEF2B6vU0tkqFw14x2Q8fnLFrTKSOMt2vwL5CdwCJbzxAApRNPer5DY1pHxO0uf5H/xrjzhZCnPqgjfIx+xD/KPlijtz3eBHQBTByH/+cl3/F7b3SOriU6KSz6eMBxs+W2qyw0BfEyvSUJN9AjaN22NxeEaMOka+kE3gw8Wn7mGG+7VJ43jAf2bbQ8kLu2NsstugzU98h3CpmnxKUY6BId6zG++imS9PV9IedlSJV0TvQOggmj4im75eoaPGoHZ/x7RqvMXo37AMMPyRuPgipNy0oyAcm2dbND6gRczNDgvrGkBlU3LY2KB7eSh10iYC76K1BS4XmANUu7R/pOl0ErJsXZawaLljbZU6f9sU/d0Pq8mGCgv/oQtAQcARMR6B9wPKZqioo0j4O0yTCbB1Ci5I56WSaOMotkBky4KUGJMKce6J4IDM2I6P+rFGKrQ7R8LHtCqSEGqOGSBIj3GWIMgXluCGBZ8SjcybqMMZNwLBd/RgOHRf3B7MQ5amdvscHCq0DjHVSaY9sZ+ffn2d2tBjwh6aPs2ZF0Lzeq/AbI77err66KGacovRFnbg15YYfjV6MlmwjjuemWEjPRhTo/gS2fpkkATYwgxobcTdFJuNR3ON++gADYAiE4PNdTNoJtHpQWBIGwX0W2edt6EVej56Elu0GVOK2NZHAeQ0C7e4NW9AmB8F67nb8wnl3tajVGki5IBHVC8hhQRSrmcYHhwAtsfM= X-MS-TrafficTypeDiagnostic: DB5EUR01HT101: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 71Z57aCK5ar5nfN6IEXzod1h4W4EOf0kaaJRy6WQ1Mkewk46ssoL+dy3iSuxLYKkrrILScQqaEzztjuLl5O/OPCNS7KiaElae84D8Zje3c+WKwrQJJsCeHbkVkWgRqe04YEDRCp05+QVJkn7/AHzKdLPLh7WHx2DDQA0dxOkNFGHs16ppVQ8YJww4cR8Kcbk46IUPhO3EAHl+3CMkh+DviydBAyCFatm+Ak7S1EKu9z2xWjArX0f5BIg6OEg+PQpNDOodvAyOtfZLyUHy4p3HHIsEllNZXbrmwR9p/7CH5QVJsExgK4uMtFJ2zElXjqwrGG8LGvLmF8Rtfd+4n17z3Y7e28aGgd4wyAAr4RFVnsCCxZ/6IYWwyUWB2CmShmdHm4C/K9RwPBYwhuBEN0b6A== X-MS-Exchange-AntiSpam-MessageData: zsrOoPiT9bUAbQRkzbmvb1NWwcHQLCylZFCLjln2kLFLF1f3HL3Ooe55iM8ps61JkWH9G3PHECMbzHzHm/s45gpFAWrrfuTHf3f90UOjBGZvxUBN6UkWVD9XwPx6tzcvvIJ21WmhdHei5xtStYJiyg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2292f707-7383-4e5a-da06-08d8ffb29348 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2021 02:02:52.1528 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT021.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5EUR01HT101 Subject: [FFmpeg-devel] [PATCH 1/5] avcodec: Remove redundant freeing of extradata of encoders X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" AVCodecContext.extradata is freed generically by libavformat for encoders, so it is unnecessary for an encoder to do it on its own. Signed-off-by: Andreas Rheinhardt --- libavcodec/flacenc.c | 2 -- libavcodec/huffyuvenc.c | 1 - libavcodec/lclenc.c | 1 - libavcodec/libfdk-aacenc.c | 1 - libavcodec/libkvazaar.c | 3 --- libavcodec/libopusenc.c | 2 -- libavcodec/libspeexenc.c | 1 - libavcodec/libtheoraenc.c | 1 - libavcodec/libvorbisenc.c | 1 - libavcodec/libx264.c | 1 - libavcodec/libxavs.c | 1 - libavcodec/libxvid.c | 1 - libavcodec/mpegvideo_enc.c | 2 -- libavcodec/opusenc.c | 1 - libavcodec/vorbisenc.c | 2 -- 15 files changed, 21 deletions(-) diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index 05a85d830f..32b2465279 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -1455,8 +1455,6 @@ static av_cold int flac_encode_close(AVCodecContext *avctx) av_freep(&s->md5_buffer); ff_lpc_end(&s->lpc_ctx); } - av_freep(&avctx->extradata); - avctx->extradata_size = 0; return 0; } diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c index 2882433db5..7e5c8f7fac 100644 --- a/libavcodec/huffyuvenc.c +++ b/libavcodec/huffyuvenc.c @@ -1038,7 +1038,6 @@ static av_cold int encode_end(AVCodecContext *avctx) ff_huffyuv_common_end(s); - av_freep(&avctx->extradata); av_freep(&avctx->stats_out); return 0; diff --git a/libavcodec/lclenc.c b/libavcodec/lclenc.c index 4fe52b40da..fbf65e5428 100644 --- a/libavcodec/lclenc.c +++ b/libavcodec/lclenc.c @@ -161,7 +161,6 @@ static av_cold int encode_end(AVCodecContext *avctx) { LclEncContext *c = avctx->priv_data; - av_freep(&avctx->extradata); deflateEnd(&c->zstream); return 0; diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index 6494c11ddc..692508eaa3 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -112,7 +112,6 @@ static int aac_encode_close(AVCodecContext *avctx) if (s->handle) aacEncClose(&s->handle); - av_freep(&avctx->extradata); ff_af_queue_close(&s->afq); return 0; diff --git a/libavcodec/libkvazaar.c b/libavcodec/libkvazaar.c index 4432649853..286d97a318 100644 --- a/libavcodec/libkvazaar.c +++ b/libavcodec/libkvazaar.c @@ -156,9 +156,6 @@ static av_cold int libkvazaar_close(AVCodecContext *avctx) ctx->api->config_destroy(ctx->config); } - if (avctx->extradata) - av_freep(&avctx->extradata); - return 0; } diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c index 70d17f802b..6c7ec4db3c 100644 --- a/libavcodec/libopusenc.c +++ b/libavcodec/libopusenc.c @@ -432,7 +432,6 @@ static av_cold int libopus_encode_init(AVCodecContext *avctx) fail: opus_multistream_encoder_destroy(enc); - av_freep(&avctx->extradata); return ret; } @@ -538,7 +537,6 @@ static av_cold int libopus_encode_close(AVCodecContext *avctx) ff_af_queue_close(&opus->afq); av_freep(&opus->samples); - av_freep(&avctx->extradata); return 0; } diff --git a/libavcodec/libspeexenc.c b/libavcodec/libspeexenc.c index 6a37dbc76c..9ea35a763f 100644 --- a/libavcodec/libspeexenc.c +++ b/libavcodec/libspeexenc.c @@ -318,7 +318,6 @@ static av_cold int encode_close(AVCodecContext *avctx) speex_encoder_destroy(s->enc_state); ff_af_queue_close(&s->afq); - av_freep(&avctx->extradata); return 0; } diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c index 16966ed433..8a7b80e174 100644 --- a/libavcodec/libtheoraenc.c +++ b/libavcodec/libtheoraenc.c @@ -365,7 +365,6 @@ static av_cold int encode_close(AVCodecContext* avc_context) th_encode_free(h->t_state); av_freep(&h->stats); av_freep(&avc_context->stats_out); - av_freep(&avc_context->extradata); avc_context->extradata_size = 0; return 0; diff --git a/libavcodec/libvorbisenc.c b/libavcodec/libvorbisenc.c index bf94764954..9d36457328 100644 --- a/libavcodec/libvorbisenc.c +++ b/libavcodec/libvorbisenc.c @@ -196,7 +196,6 @@ static av_cold int libvorbis_encode_close(AVCodecContext *avctx) av_fifo_freep(&s->pkt_fifo); ff_af_queue_close(&s->afq); - av_freep(&avctx->extradata); av_vorbis_parse_free(&s->vp); diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 4ddc4973a4..4535d23848 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -508,7 +508,6 @@ static av_cold int X264_close(AVCodecContext *avctx) { X264Context *x4 = avctx->priv_data; - av_freep(&avctx->extradata); av_freep(&x4->sei); av_freep(&x4->reordered_opaque); diff --git a/libavcodec/libxavs.c b/libavcodec/libxavs.c index a83b93b836..62f7e9dfa7 100644 --- a/libavcodec/libxavs.c +++ b/libavcodec/libxavs.c @@ -228,7 +228,6 @@ static av_cold int XAVS_close(AVCodecContext *avctx) { XavsContext *x4 = avctx->priv_data; - av_freep(&avctx->extradata); av_freep(&x4->sei); av_freep(&x4->pts_buffer); diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index cb9135436a..a74a2c1dd2 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -883,7 +883,6 @@ static av_cold int xvid_encode_close(AVCodecContext *avctx) x->encoder_handle = NULL; } - av_freep(&avctx->extradata); if (x->twopassbuffer) { av_freep(&x->twopassbuffer); av_freep(&x->old_twopassbuffer); diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 7909a5630a..6435c0f668 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1032,8 +1032,6 @@ av_cold int ff_mpv_encode_end(AVCodecContext *avctx) s->out_format == FMT_MJPEG) ff_mjpeg_encode_close(s); - av_freep(&avctx->extradata); - for (i = 0; i < FF_ARRAY_ELEMS(s->tmp_frames); i++) av_frame_free(&s->tmp_frames[i]); diff --git a/libavcodec/opusenc.c b/libavcodec/opusenc.c index 8bc9e9dc4a..5822482bbf 100644 --- a/libavcodec/opusenc.c +++ b/libavcodec/opusenc.c @@ -614,7 +614,6 @@ static av_cold int opus_encode_end(AVCodecContext *avctx) ff_af_queue_close(&s->afq); ff_opus_psy_end(&s->psyctx); ff_bufqueue_discard_all(&s->bufqueue); - av_freep(&avctx->extradata); return 0; } diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c index 1b0ab3cadb..091338b41e 100644 --- a/libavcodec/vorbisenc.c +++ b/libavcodec/vorbisenc.c @@ -1254,8 +1254,6 @@ static av_cold int vorbis_encode_close(AVCodecContext *avctx) ff_af_queue_close(&venc->afq); ff_bufqueue_discard_all(&venc->bufqueue); - av_freep(&avctx->extradata); - return 0 ; } From patchwork Thu Apr 15 02:03:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26917 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 03C4444A0C1 for ; Thu, 15 Apr 2021 05:03:59 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D4A0368A486; Thu, 15 Apr 2021 05:03:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065011.outbound.protection.outlook.com [40.92.65.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2EEE689A91 for ; Thu, 15 Apr 2021 05:03:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DiVi7Ylm+3Rvnmng0nrScbKt/75/nJolITJXvnd+YV3qcZ+sMTMIyJJ5/uA7BQVDsvDPhzzhyK3+14R4ThaJXrKola9M94v83WGJVkEAtbmvFn3gTKDm1wjH8tFjWkEkfmKshMVFxmtmkJC/4+Eo6OZ12V4lqiCY9Q3a6aWmcAI3eDJbn/QCIpIQ85ZlE76n1Wt5sZkMVxMQd/Ryy7Of93lNW0J8cVchiT53rjjsfvt2TTH0/80rbS4c1kp4Qa+ZbAne5sQtuA4vlHORK5PIEHKv9XY0swiX8VV2qamkDvon1T68SUJQDej01+5J7y7QlyO9c72LekLPqu52oP1GjQ== 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-SenderADCheck; bh=Noo0pddUuHJKkRiY2yKOb2wkGkIYMfSLepRCtM2cykk=; b=fwDoRFUpMdhqtQ15Zs7RsAV8sNmuRLDzOWTAwnfKUYzihoMrHGTk39BqbuEeLiq3bBoij3Y35gC3BXZgqHnWu24R8L8wBcrSEkoJtoedAD6eBUld29X2RaoNYsMuibJRYiBteEjJQRK+AWaSSmYwVs5FHia3ckux0G+iKVPnVdC8rVpkdxCUhlroZRmnURcq3pqO/69DcsCRWz3U1LZwHqGaqJBC1l4pEQkASRJjl4Wy/pa08b+vnb5murki3fkHL/y6BQfKyikLU5OUMyemzow7AIoFVPMOTQ+TgV90iiah7wxbPcuM0PxpfTQb4jIwqCAcCDfMMthXQWFwGdo0qw== 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=Noo0pddUuHJKkRiY2yKOb2wkGkIYMfSLepRCtM2cykk=; b=jhA3h233gB1w8AWflnueOLUiaTjm7F41vZGTFCNl7DvcA2iZDJNzFNc1G+8yT2G9bZEPZehqIyd82XMRcJ3jCrnsmAyi3XBeStJmRZ7wMS8ANY3i23D+hH4K2YSElW5KEdFadl8j8jLyv4cqxYySF0Stb1ztwPEF8qygHdWnke9holdKXXoy0ZfP0LQvAZ2nDoVNdo/YMjYNKb5NJ7MlFPLZPCj51E9BwmT/B5rJUZnYl5YZnbeKBdEgxB+xWElyy+sXeuBHVWD/icDk++8dr+a4/VCLS2/ydnJe4DPWcehajJp6l+BWXv2gJiTktZKLGArtCDCRwJUoHru01IrGXQ== Received: from DB5EUR01FT021.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e1a::46) by DB5EUR01HT009.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e1a::118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16; Thu, 15 Apr 2021 02:03:51 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1a::42) by DB5EUR01FT021.mail.protection.outlook.com (2a01:111:e400:7e1a::245) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Thu, 15 Apr 2021 02:03:51 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:CDDCCDF88BF5870C2CD905D34E212CB50242DADEF4B51E2709C5B35332317855; UpperCasedChecksum:EBDEC4B7A00DB4580AF4AA2E9CD65FFB8FE49E66944868A754F756372C19247E; SizeAsReceived:7583; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4042.018; Thu, 15 Apr 2021 02:03:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Apr 2021 04:03:38 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [zYWa2A5WAOCDR0EdUh5xq4sgvRXpRbWS] X-ClientProxiedBy: AM0P190CA0012.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::22) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210415020341.1410917-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM0P190CA0012.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Thu, 15 Apr 2021 02:03:50 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 185595cb-0a0d-4068-0efc-08d8ffb2b6e6 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWz9ZT4nZGZNcXnZ2gUA/tfr0eVeoEdvYMXmPp0w6HpvVvyBHB3FdpNC/Bppub+iz6V1K8k0EO9FklZONE6NEy9AkRZ5glnkEXcxuFH3PHE0wysKq2v7a8UF83ouv+m7CJt4WDzPzW08LtGOkCW7CKKKjEbZAvMwRcPVncuzLQl07G+X15T2E+pwrjABuj7u9MzKLULOLrUmZSfo6LBDeTlHFY4+5FQ9g86i0srWhv0A3zpHeOQpV3ymMuJ3JmMudN+fjLLx5Cp7qUN/LKbu0BKD2MN8LkHR2VqR8V4nGEYms/QYUeqX9Ui9MbNXv0RBx8xOknP6ncSqaifd5lAzm3xNVLkmJXZJuXs72PSGBfR8DYVrdLnWBiMFl4nOGNgpWvSONCu42otx+aZGwFwtSLgoshbMk3lBgjk4F34yYkhpF4B+QCW8zmfSIASt71Tv4ArwFBkBLTs1CsBR4IHBJohGrvx591DgXizXpcz9xPmfSh0of+fkvx8iqq/ytpxFiv9DlvtnZdRtaAh4d+zJSvzpv4LScm2eysHubMRz2NzeFG8KoT0peF+A6ef2Q5NGHAGz0GjHTgOb/ZWGNH28qPE0gOXj9snqZHgIA/v8hNGDUBPK3c80YxWZaDGuzXQlCZNqBEKFOGqbmMl0RPycUelBkPimJk0Yjq8MNMZWOn72X+vYZd9N3egQLMTncib5gbBCEBy6N9ZYepuylTLfcgfJQkpkrI0oaI= X-MS-TrafficTypeDiagnostic: DB5EUR01HT009: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mzd2TNB31AT/DNCDUeRS2+LCzDq0X27EtZii35nkH/grUxUmfl7/8lBI6n/GDlMU5NORHcNoDcnfMC+/kp1gFgfFsgsqKl7Dc7NqmYxDd88K3vyiDIOBc1V/nvY8GGdfvNmfc/6aYq0XVn7o1nFq/dOH7UqkHBhyJETXO8zgPOnL5j4JBc+XEld8gPLTqb0gqTj1lFP5XYwC2gkPnoA1TIGCx2/eW58g3IZBNUSTWx3gGWMUukVoem4GMswYMpOVqrF9tlxyIlI0/bCZ7YVfNzokoO2sS9JDiWD/1ROFcSksLdCx+Rj98Cayr99xDUnNaOEfvTOHcF7ASLTyD/VN0shFjdk5KlDO1EvrLCH/s/aNAw5Mr7mNKL+zZ0hhXOxbn75yZ1oyG93GG1WdSTHALw== X-MS-Exchange-AntiSpam-MessageData: LznHEzCr1cNF+HtUfVSupeU0ruAun5d/dlN573NHdkCZsWtMIijhhfNLaToNCHrgF+QBim8xkl4sqh1QoihhIKnY/zWQrYU+bovjIMX1XDzpudWFC28bO0jorwvjeTNbvSSgjyvr3ZBu0DgYP9tZag== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 185595cb-0a0d-4068-0efc-08d8ffb2b6e6 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2021 02:03:51.3006 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT021.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5EUR01HT009 Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/flacenc: Remove always-true check X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/flacenc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index 32b2465279..f1e3e1989b 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -1449,12 +1449,11 @@ FF_ENABLE_DEPRECATION_WARNINGS static av_cold int flac_encode_close(AVCodecContext *avctx) { - if (avctx->priv_data) { - FlacEncodeContext *s = avctx->priv_data; - av_freep(&s->md5ctx); - av_freep(&s->md5_buffer); - ff_lpc_end(&s->lpc_ctx); - } + FlacEncodeContext *s = avctx->priv_data; + + av_freep(&s->md5ctx); + av_freep(&s->md5_buffer); + ff_lpc_end(&s->lpc_ctx); return 0; } From patchwork Thu Apr 15 02:04:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26919 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 436DE44A46B for ; Thu, 15 Apr 2021 05:04:24 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2507D68A48F; Thu, 15 Apr 2021 05:04:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066018.outbound.protection.outlook.com [40.92.66.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 833E568A0B6 for ; Thu, 15 Apr 2021 05:04:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dmQCcqXlFVG6e0wsCrSU8fT+ejnY8bIw+nvV+WW5j4EixclCAlasJQah0Rg7qk+F3I7xyu8AhuobFlIbvOoSwJirVecvqjDQme+nM+UejoEb+68Nkpa9gCwCfvcLW9yC61YDnmSzOVtU2GFhrwRzPcZ8INPN+NYuSxeTobLgMbPpR+1eDy8JjAR2Py33MG8tbcgGlSDLfRR2vYqM8yt8d/uriR/BGGOvYoIqLYK3Kat+ncXQTRbviMOB7pi/gigUh2JsZ7l5Uy+wUGLkO5KMYT0zZhlXcYesTnAdEXy0PQC3xhT+aK45v/rYHVdhIhnnKlNTSpZzMr59EZMXDrpOoQ== 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-SenderADCheck; bh=NKGMJvOObRjHz9eKfKnlSszxp9v+7Q9/RWjgNZomT9M=; b=crufs8lr9LO7kkHKt+hiyz0DgKEmQFKDt0guEF329wQwy4SN/OmpiZkgQAXN+Kpka6cHP6UBIaOSJOOdfkNmWiMPrpIhMmyOzLxNzRQ5ZCyjM6E5j8oMxKq3xH3/6EwTWjylgvkM0WsKDAvAaWccDVDOIlSqcZPw477P02LClG7MfTBGn/zON3K5AwLSafN3fXSYQ4NpcI+/SHuLPOdOPzvM0nzO81H+Ky2p8rX5RWdLrvnP8BY7dXRaLNySwJGBUmuX6bu4qqx071W7SWiNt2SLKqWIRe7SCfXe6XJ39wz+w1oT+xJLDlEf4PmtPhELh7Sgfma4PWpxxs5aoj8Bsg== 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=NKGMJvOObRjHz9eKfKnlSszxp9v+7Q9/RWjgNZomT9M=; b=STJ0jcxRBdTju2kx0/VARSY+KIxUxafYyED74zLLIBvD+Fv65JgNErmPvv5yAYN7KE7LsbNpgJaGUsHnTjOZ+NGaG6GjjPpy5HpK3PwOyNDcEIzg9ywz/vaOj9cCcveZ7LBJ717DVR+/nXsMixnerkiFW0h/K3s9awll77/wHt3hrCB0tgyxmsWZH5DDAwrlD83/tHLoM4O7vQc1nfSJReix0W2iVqdeGYRB03AfXurDMuSwjKOTF31MTM1TNq5uactm5QmD1yjT9fOxGFqK5J2YN80jzuefw8QYesIgZAw3S/0IlPNW5FxW0tJ0HBMhQHEi0ktLyMguYzA6dN8idg== Received: from DB5EUR01FT021.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e1a::48) by DB5EUR01HT044.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e1a::374) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16; Thu, 15 Apr 2021 02:04:21 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1a::42) by DB5EUR01FT021.mail.protection.outlook.com (2a01:111:e400:7e1a::245) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Thu, 15 Apr 2021 02:04:21 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:7CE4AA6E15B653B2513FC21C46267AFDAC91D356493659B50EFA9ACF2ECC4E32; UpperCasedChecksum:9AD2B1F23116C2E1246519F48724758355110C1EC83827A3251F86EDC9312DCA; SizeAsReceived:7574; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4042.018; Thu, 15 Apr 2021 02:04:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Apr 2021 04:04:09 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [NWpbxTYfTaQXaBOKE+ELK+oO67o5Jdlr] X-ClientProxiedBy: AM9P192CA0002.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:21d::7) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210415020411.1411024-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM9P192CA0002.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:21d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Thu, 15 Apr 2021 02:04:20 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: e2a03b92-045d-4b20-24cf-08d8ffb2c8bb X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTEEqEyiKFNUcsVK4T7qzgRK0HmsoQiiyE+zPbaahugYwJ3SK+x/tfYmzHP/leLn3mtuyihqS0+GUaSvYlu9lF5Z8Q4LMpwRce7hCGH/fr1fjqa6dqxOE9RxU2FwW+MrirjdYYUS+oRcrHdDsAOjhdxwmJZy7PMFP/xsQVxLPF3jQfFcd2ESGqVnfxxYprH/2p1X0Ansfb9UTJFibGjWxt1rP8Wn0AXR9e6DEyD3t+mxCBSAyrxwplbwqwF8Tgfz56Sg5vVG/3yCVwmI5YHvq89pbO8sTccIMa81HDmF3fjWhZxI4+TIamVcEXZmxnrvFjf5Kxro7Mb4RDTaDXQM4Obrc1KEasG6a48TecPaMpvdmVeu338HvJDoftkCsQSpXlI9rulZL/fPIG2/aoHxROpMwo53PC7cwicS7OePemJX/rhpP9HrtsjhS7UZmG4SRm4P+wvg22zWZGy8FotQr50KvqUZSiyRWA2XOwEBn8kAmdYYQEOzxer8MwXb6iBnYP30VvqmxZd/tAFH4vM2OqTMqMjixBffoYYsF1voaMAHxabM02OzN0xM2QEfj1kD9gcZCI0sJU7T91NX32t2cDFVKntPrT96PsRpFXKvdwfUegQQapQUruAjDYyPl2ub4xMOC0PAyTkxzlekLOcSvCukf1NBBv7R2tRxSDaEY+rGq0MX6wdIfm4/oUms8VV2g/7WDKtTdeVzlWNN9m1DH08NSeLr2p+PsfBIgE8FXwTwtBY0tGnw7IQAQK6ca4vsS8= X-MS-TrafficTypeDiagnostic: DB5EUR01HT044: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aNVZea0E+F6XDq0HjiVJDQ5llBRwtzHSB2Kg4iSPKRaAlsCNTsR4403SJ8y7huiWXoXO90aB9F7lRqp/B5tHVCv/Ve7V7/fHCTtktnB93p9gg0kS8/j9PJKsDB0S2JUuQv17e+p+j8Zmjj14v+dUQ/FTRsCue1nSH7jnFDAs+HPu2iiCBJIPQPRTYy+aUzE2YW6bzQbCMNNaaCJGjEXHwzBVqdiJkNbeaNRsJLn92cU1sXf4o/xmQnE2XPOqHJ5Cp9JODMzG+2FkCaaD8ysYYKIlKhk9auFtFed2ADlldm6feTq3asbn+WkPQXbkYk33PMiSvsjSNVHrpn5vtN+rlvxrKZv+XL09pV9VR1wz2SjSti/wsyxw6X4up4Mu2Syy X-MS-Exchange-AntiSpam-MessageData: M6/z2UPlAkYhXYtLknVEq4N+ezJPURrnsfs2guYulsci7YGQXb8iiifRjl5QQ/e9nHQAF4ZLwZ9dAvS6Ru9kf4TVp3U7CKmGPSr0Bf4tBHLCmIBYmQlyME2NlgLiUIABjM39XYn49xvmoH7DzTsZ4g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e2a03b92-045d-4b20-24cf-08d8ffb2c8bb X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2021 02:04:21.1603 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT021.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5EUR01HT044 Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/libvorbisenc: Fix memleak upon error X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" The vorbis_comment struct used to during codec initialization would leak in case an error happened after its initialization (e.g. if the allocation of extradata failed). This has been fixed. Given that said struct is only used when writing the header, it has also been moved from the context. Signed-off-by: Andreas Rheinhardt --- libavcodec/libvorbisenc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/libvorbisenc.c b/libavcodec/libvorbisenc.c index 9d36457328..b556280a95 100644 --- a/libavcodec/libvorbisenc.c +++ b/libavcodec/libvorbisenc.c @@ -47,7 +47,6 @@ typedef struct LibvorbisEncContext { AVFifoBuffer *pkt_fifo; /**< output packet buffer */ int eof; /**< end-of-file flag */ int dsp_initialized; /**< vd has been initialized */ - vorbis_comment vc; /**< VorbisComment info */ double iblock; /**< impulse block bias option */ AVVorbisParseContext *vp; /**< parse context to get durations */ AudioFrameQueue afq; /**< frame queue for timestamps */ @@ -206,6 +205,7 @@ static av_cold int libvorbis_encode_init(AVCodecContext *avctx) { LibvorbisEncContext *s = avctx->priv_data; ogg_packet header, header_comm, header_code; + vorbis_comment vc; uint8_t *p; unsigned int offset; int ret; @@ -227,12 +227,14 @@ static av_cold int libvorbis_encode_init(AVCodecContext *avctx) goto error; } - vorbis_comment_init(&s->vc); + vorbis_comment_init(&vc); if (!(avctx->flags & AV_CODEC_FLAG_BITEXACT)) - vorbis_comment_add_tag(&s->vc, "encoder", LIBAVCODEC_IDENT); + vorbis_comment_add_tag(&vc, "encoder", LIBAVCODEC_IDENT); - if ((ret = vorbis_analysis_headerout(&s->vd, &s->vc, &header, &header_comm, - &header_code))) { + ret = vorbis_analysis_headerout(&s->vd, &vc, &header, &header_comm, + &header_code); + vorbis_comment_clear(&vc); + if (ret) { ret = vorbis_error_to_averror(ret); goto error; } @@ -264,8 +266,6 @@ static av_cold int libvorbis_encode_init(AVCodecContext *avctx) return ret; } - vorbis_comment_clear(&s->vc); - avctx->frame_size = LIBVORBIS_FRAME_SIZE; ff_af_queue_init(avctx, &s->afq); From patchwork Thu Apr 15 02:04:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26920 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 40E8E44A46B for ; Thu, 15 Apr 2021 05:04:27 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 27F3668A67E; Thu, 15 Apr 2021 05:04:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065049.outbound.protection.outlook.com [40.92.65.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 725FA68A329 for ; Thu, 15 Apr 2021 05:04:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hjRJL638wQzLMMhPXca5XxP6DTkuMJZedzEfjuLdr7DxHxDK1W1drnb3tAPU686NeSvkRnzpkX4pUfuH39oa8w911MMoTi60fHUQzfaMqD9G5vOcGexw0KX60xMV1aExWe6Mmisevbnla2ywPzQQsnsutslfqQJ1BuScC2vUlVomcIV7ds48E+P1tXIXvNnhZhat3TfqJkvhXfynlC4ZekX/FsmY1BpfaS3dXwfCV7j4Sj52jOOfnNdG2n27V/1k6jAriMbsmiHBxu1WJq5D7UoROaNwXn9FE4dfd1H2wBNrLLrN6CSZGTJxVWXAgh9UtKT77EqFGNhHYe02k24tjA== 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-SenderADCheck; bh=jymRkBHBz+Axyv8i7r2ifYNXhep9NmPubdCeUlSYebI=; b=d6BLBfauq2VLloYhx8A2Bt0P33K0jbzx6EKaR8k4nxXlVBwaRmt6HyjmmLG6RfXEQ9R3qWQmKlUu6OLgI1PShfpllMBHyPD7zneUDNLMUeHSg161KACfwhFQJoQrhrW/Lhjpx8VlaMm2/E3i6IOTGRS/QC2LnZF9rxtw2v9f/YQOTv92EBqkfo/ItPi3Ud4ioLd7ZBqZ5PCl5ezhaT86jf7lPkIcgiVO2k2Af7pKr2mdwk49Wokbh43NzGYDnqfVliSv+4s/C5rrYRnYzxgSzCgHYu5DJvfnoU8m8Fn5mx2L/vYRL85jGDB+lYldh50gBWj4W5fD7Pz3mFgjvxYM+g== 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=jymRkBHBz+Axyv8i7r2ifYNXhep9NmPubdCeUlSYebI=; b=PBTmrrOEhJgUbmI9ip+Yzstgj6m5jxbY//0AI9ddORpiHcpeCQbxqEUzZm2K/CgDh402EafSW71kRUUEneTTFJa6GioXX8hd4diUzO2/JrNk8h/UIiQDTk0FHQxrAVnChPPP2k6Oz5n0YIdHYG/DP/cl3tftdsWfI80+GR3zg+48LFJVzyGKyccC478hzDOMpCKRT+ZW8G8TrYoE7vfbEEoF7SoPMs7/VHC4tNxJ53JuTKWyAsaP8Xjpdy9Q65slgBgdh4U4k83t++u0jhabrUYk4Kh/tBUGnwjgyXQR2lqext0xiXTleN2EmTGkfDRPrfJ3XIzHZUobNIerAw3nPA== Received: from DB5EUR01FT021.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e1a::48) by DB5EUR01HT186.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e1a::183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16; Thu, 15 Apr 2021 02:04:23 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1a::42) by DB5EUR01FT021.mail.protection.outlook.com (2a01:111:e400:7e1a::245) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Thu, 15 Apr 2021 02:04:23 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:7C56711F8CACAB20398F0F7BCB56835FEC6221D2F5785C9730ED5BDF5603FEDB; UpperCasedChecksum:591352383B251A21B957A92CB72F5FD4CF2008718CE139D04CA542CE04DEE0B4; SizeAsReceived:7595; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4042.018; Thu, 15 Apr 2021 02:04:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Apr 2021 04:04:10 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [nxyoJLcz0AARbCCAX2UCP+qcE3PqWNZn] X-ClientProxiedBy: AM9P192CA0002.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:21d::7) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210415020411.1411024-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM9P192CA0002.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:21d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Thu, 15 Apr 2021 02:04:22 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 6c5db4b8-c936-4265-b95d-08d8ffb2c9fd X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTEEqEyiKFNUcsVK4T7qzgRl0R+FM/hAwPimsUXwYMjTaFSJrbBR7AgEzR6RSThbbCjKlISft3Almo1G+bR/jS2l/Nz3xDAyeIscfxrpdFLXYBe/0Df0aw53PfcTvLPrRFHb+27su6+xs+CxO2g5HgsyIwfFAo0/TnEozkC/Uy5n0L/vpqqvae/UZ9Dn4OU49sxVTwrRRxSbtRjVH//GmeMywf0F/OKWyWwxzDiUSkqYG+4aqkWFFKCgGvZuvKtOW8LYiF5uc1Uf2DyHlGnjMJPcqUbsWQyfQGjF9F3q7qJlQaY4tGKL7xWnRWO23N0xYOJedEY5h5WryXqphgeHzlmeo5UQ4I60ZwY1MhD63gnxG/KUEhk3qlehhZqi7SkFPGhe0RyzbgPalzRtyg0MPDuuKVnw5gXr1qYVhpNN9hBQDoHu3aBwCwE3vYzXeYf51QcJt8BU2efLdMMq5B2Gfqiv5vHUIG+p9FEx0+nb/cOEyfzSL9mKkM6g+bpoHKWw/N1JplpfAtzoZTsSwwPC9Nn2t86k8EU0v5WBu1DEnP2VLu+sU2/weumVWWrRDYsJ+Ag05h8Mlhny3LbRwJEavWk9Oy+zzYvZkLIrH3NBfOrgDdoATz0/KHg05ULsyfSOZvZ/8N5mclVGvDYuSdlZBeVVvS+TLsZLtoV/e5RW/Tjb9KPesnFw16pKn1PTjX3zSKFDZr6i2WulUpSCJzkDXzCte1pNExSDtTvcPkxfIpVvydnQoTwJ/3NKox/oJBkRwQ= X-MS-TrafficTypeDiagnostic: DB5EUR01HT186: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MIHTEwJV9UBS8eALx5Wla23qeZWhGUVeOHCaIcxd7h1edAlt/YTgVw88XPSwdAmVXhj9OmjdQgYoAsfqwRlE+deBERnALvYDV04VsA7AIhQYJPJ0eKcxENTcuUC3xyhFZEMK/5+a+Sh1KxTbTXrNu1hwfVa8xGZG6CPKL5gSsxY0dXKYi8tPI10IPFOj6uygYtKnQB/11JmtYju4VJ+ds4hhg/yHQgx1/3v7ztO0mpC45bK+dknkNkre5OnKMSz/E+pj+5veLVypzawSPQ5rlVwhtShxIvX/KJwcPelh4xbv8LKfh3pkPFKFXCbVHMKQD/9rj6ctIxgVr8mxmx0gAcUlDpPU0TFXiRahBHbKnqVO5IHg8+X1xkUc+QCflrLtyMumyrTej45ud0LWW2cllQ== X-MS-Exchange-AntiSpam-MessageData: tQNdi5ZCuFJxZdVLtVSOHQrGp4xnyExjODYMxRdjtf9n/K+Hw02l947kfxdzYDvbEOpUzlcRyNEQ5fTO7NTZoddgoVXN7425pEfp8MEPPbZlSObZdWKZqGe3DS+c6wc5Gd1YnioMXtAM7bXByFez/w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6c5db4b8-c936-4265-b95d-08d8ffb2c9fd X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2021 02:04:23.3054 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT021.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5EUR01HT186 Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/libvorbisenc: Actually set error upon goto error X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/libvorbisenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/libvorbisenc.c b/libavcodec/libvorbisenc.c index b556280a95..061a4e9da7 100644 --- a/libavcodec/libvorbisenc.c +++ b/libavcodec/libvorbisenc.c @@ -263,7 +263,8 @@ static av_cold int libvorbis_encode_init(AVCodecContext *avctx) s->vp = av_vorbis_parse_init(avctx->extradata, avctx->extradata_size); if (!s->vp) { av_log(avctx, AV_LOG_ERROR, "invalid extradata\n"); - return ret; + ret = AVERROR_UNKNOWN; + goto error; } avctx->frame_size = LIBVORBIS_FRAME_SIZE; From patchwork Thu Apr 15 02:04:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26921 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 367A844A46B for ; Thu, 15 Apr 2021 05:04:28 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 24CA768A78A; Thu, 15 Apr 2021 05:04:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064075.outbound.protection.outlook.com [40.92.64.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C27BA68A3BD for ; Thu, 15 Apr 2021 05:04:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SMprnA3thxA17nmLu5E1ZwNViLv6DLLWWBJnsLT6Hh5f5CRm45y6y5P21hVfd1VrOWt3ifACvd7rFb+QSYbh+Z/sjv3wTE0aQa/BebEetKwI1nbAKuR+9bnCKfPpTaxScJpXBU5/l+TP8nu9EKMuDfPFcA+H5744nVAZolEJDNdheYncWswtjYbBmbWFFD4E/aKX6Y2lmygO/dINDIylJhh3svAjGAqYrbFnVzubuMjG3gVjuMNCmIMG4k9GuFwsB0o6NJl6oYFQRPntWJKKjyixzkJ1nacKOy5+9qyIb+wf3sY4IVcBhpRFebk29avH2pMwJJXkcSc3Xi5fmVtB3Q== 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-SenderADCheck; bh=hHHfUzzWkAAu94vGvx5oOI5GbdobLk3on/akFLEE86o=; b=iAHp8AT1TD+erDheoKXDa9toJW8OHcnX4miCA4Npjtmjlr4HJ1J7haO05CjXKJvarLKgqQgKlYsoze3mDzhQUqERbb1SeB35w2NH1WkSl1gQw/yt96qYoQu+fgQnjB84s6IErog9EDNUf8YmhbFXKDICCUK1aLXMLCMu83EujdE+SWMcYYDczPjCOcCltgCFTIsPEKP7ZyYW8cLxOUwWCoxKgCd3OSk7mKEU7gYZXUfTLqbjF+tCN1Ab22GIdkJRhyyrbHLfzAXsszY7rIyXA+WJ5LrwhciXewmN/uvcdxlQLH8YWWeCLgQ/3xV7iMh6NYp5je/cJTMwbwk70ojsaw== 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=hHHfUzzWkAAu94vGvx5oOI5GbdobLk3on/akFLEE86o=; b=Y5r/IIRuWQBtLzRI1s350tOq8O3jAQYmkr4o8VLF6vzSZsZ5lXYmdSWhN4gj0aB7IcTIi7vBK52mduEHPO/CeZpNsOi0BZ7+uhJKRA2yFSexCiWdtus7yZTauvd6nSwpGw7dIqjQ2C995EBJY9FV0SM0kTNXFljHUhjgZy6NM6T3cxGr72oIv7Sj/VnTy0l2P9aNDXQJsss/jUHVkFgTcjeoJgAH7X70z7wNvNbeMtPWOSHOTuH3R2vvvB/1xL+309E5xvFQdq/I89FipoZASmWeN404WSoSuqcvCR3KofMDvphbvomBpiujV4AxmHekYf33fMon6NhKMYO5TpPoyA== Received: from DB5EUR01FT021.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e1a::51) by DB5EUR01HT019.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e1a::456) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16; Thu, 15 Apr 2021 02:04:25 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1a::42) by DB5EUR01FT021.mail.protection.outlook.com (2a01:111:e400:7e1a::245) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Thu, 15 Apr 2021 02:04:25 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:B41451E83283408E1BE128888DE403A8813E458680A62C3865E8FB26DECD5B05; UpperCasedChecksum:0EF601DCA0ABCB7C45D863BEADC482BF30540DE311FD997C3DC4B7606949FF65; SizeAsReceived:7580; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4042.018; Thu, 15 Apr 2021 02:04:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Apr 2021 04:04:11 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [aqxeKL9W9vXFqsErouacEn/T/DaVpzmO] X-ClientProxiedBy: AM9P192CA0002.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:21d::7) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210415020411.1411024-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM9P192CA0002.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:21d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Thu, 15 Apr 2021 02:04:24 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 5d850037-db95-4128-c371-08d8ffb2cb37 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/ULVtCBeMNItAFjvDQNF2Y82FiD6/S//8WZ4gydwW6tjbE1rrlELMQT2F22HESWNleDVgp6Wcb/pqfX74xTGIPCxWHhaWVLR86nNs8zbGSRm4Zutbs++pkZruYOwv/HbN2mUwINUIanlF3nYA8Ne9Jgszg8LLa2R//kSntNx/jtqBSlNPV4zPlrPazoXNQAVqkSlUQLBAkduH//Xys/gvmRtk4ty7SnnqQGMJlyi+hTWKioXJmcc6sr/U4iVdqJpGaeHWkxzwOAxa/rQSgfXg4fz4+EicRxefQA+sgSpIKL3q4EJHy2P2T8tIUDIGHxINEtm9X+jmsPPTvr0mRLMroTYi5Y+Gx5G9YTtluuucCCaSKLOmxho/7YfLBcF5ITabVD3IH6TwQHvN4SK5VmA+bwqV0na+DE5zmr2zMMW8VwK6QVDbFN785McWwiUrcp6DdIPkMO+sSSmO7wNxFeAos3IP3RY6YwhOh0jmeedycDR+JFMXgqPt/LIwKIobg/RikcsxyErGpJL6OgLmnaVXRzl3HtN4sgSQmdSqe/fxuNxT5NHIRkl9vZeIIXI/jZanO2omnhDIypwZ2e8WgnCYtYRZiBpoa27iZhGd8cV3LgPUno59hKWrXMTvSUDerjvJB3Wr04NXaSX838+Zq7YX0xOSj0a5x1R7QT/fX0cfGbbzaExRFFpdUrTz8S/WvkUxR5E/NqL3Otanw== X-MS-TrafficTypeDiagnostic: DB5EUR01HT019: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TTpU90GMwzrww2TLKoHOxCB7KxzxAE+2830ItcRCt9fHPgdlpQOfid81F31peezg7x+/Whaju6MK8NxQT5TblloT1Wr0cKsW03YEbbogLfliDq1Bho1ciVSJXv5NXJF6NQLoPydLJI+xhwsxBc4hQtVheN915thGWC4ey1k241qSeD8hdpetiF1HGLIs1O9xfKcw5huMK8AqY+3hoSyKk9EDYAzF0yVQ2SwlotuP0L8ZbzlnMPT14AqKFXFwEtJkx8kStbR+PLT2JPooBL2Au0uL+UIXOsugF0H28xNarD3YaOc3HjYmI9uE9b7hPJUUbSw87QvCu+8oEiBr8IhsCM2qVR2vazSRxQz7ArMS6HyBN9EqPSaDybBjWR+Zp0VLakmrWDZecLKDd3bYTUufiA== X-MS-Exchange-AntiSpam-MessageData: hbh1OnD7ZWrafwN3XdStePc6kTfhITWWQI2xSpyLgxhy+piviFzLhHfokafsQ2zr6TaH08rhmWgdLe8coiSLKbVN/zF5Ap1kJOGfjbmu0zAUeDmXfz53wm3hnV5Vata3LEz1w6sVDTLm9MK8z3AShA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d850037-db95-4128-c371-08d8ffb2cb37 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2021 02:04:25.3395 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT021.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5EUR01HT019 Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/vorbis_parser: Improve returned error codes X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" av_vorbis_parse_init() doesn't return an error code which is a slight problem in libvorbisenc.c. Fix this by making the internal initialization function behind av_vorbis_parse_init() available. This also avoids allocations and frees (for users inside of this inside libavcodec). Signed-off-by: Andreas Rheinhardt --- libavcodec/libvorbisenc.c | 12 +++++------- libavcodec/vorbis_parser.c | 29 +++++++++-------------------- libavcodec/vorbis_parser_internal.h | 3 +++ 3 files changed, 17 insertions(+), 27 deletions(-) diff --git a/libavcodec/libvorbisenc.c b/libavcodec/libvorbisenc.c index 061a4e9da7..b111379e10 100644 --- a/libavcodec/libvorbisenc.c +++ b/libavcodec/libvorbisenc.c @@ -28,6 +28,7 @@ #include "internal.h" #include "vorbis.h" #include "vorbis_parser.h" +#include "vorbis_parser_internal.h" /* Number of samples the user should send in each call. @@ -48,7 +49,7 @@ typedef struct LibvorbisEncContext { int eof; /**< end-of-file flag */ int dsp_initialized; /**< vd has been initialized */ double iblock; /**< impulse block bias option */ - AVVorbisParseContext *vp; /**< parse context to get durations */ + AVVorbisParseContext vp; /**< parse context to get durations */ AudioFrameQueue afq; /**< frame queue for timestamps */ } LibvorbisEncContext; @@ -196,8 +197,6 @@ static av_cold int libvorbis_encode_close(AVCodecContext *avctx) av_fifo_freep(&s->pkt_fifo); ff_af_queue_close(&s->afq); - av_vorbis_parse_free(&s->vp); - return 0; } @@ -260,10 +259,9 @@ static av_cold int libvorbis_encode_init(AVCodecContext *avctx) offset += header_code.bytes; av_assert0(offset == avctx->extradata_size); - s->vp = av_vorbis_parse_init(avctx->extradata, avctx->extradata_size); - if (!s->vp) { + ret = ff_vorbis_parse_init(&s->vp, avctx->extradata, avctx->extradata_size); + if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "invalid extradata\n"); - ret = AVERROR_UNKNOWN; goto error; } @@ -355,7 +353,7 @@ static int libvorbis_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, avpkt->pts = ff_samples_to_time_base(avctx, op.granulepos); - duration = av_vorbis_parse_frame(s->vp, avpkt->data, avpkt->size); + duration = av_vorbis_parse_frame(&s->vp, avpkt->data, avpkt->size); if (duration > 0) { /* we do not know encoder delay until we get the first packet from * libvorbis, so we have to update the AudioFrameQueue counts */ diff --git a/libavcodec/vorbis_parser.c b/libavcodec/vorbis_parser.c index 0b2c97cde5..0d87102adc 100644 --- a/libavcodec/vorbis_parser.c +++ b/libavcodec/vorbis_parser.c @@ -181,8 +181,8 @@ bad_header: return ret; } -static int vorbis_parse_init(AVVorbisParseContext *s, - const uint8_t *extradata, int extradata_size) +int ff_vorbis_parse_init(AVVorbisParseContext *s, + const uint8_t *extradata, int extradata_size) { const uint8_t *header_start[3]; int header_len[3]; @@ -287,7 +287,7 @@ AVVorbisParseContext *av_vorbis_parse_init(const uint8_t *extradata, if (!s) return NULL; - ret = vorbis_parse_init(s, extradata, extradata_size); + ret = ff_vorbis_parse_init(s, extradata, extradata_size); if (ret < 0) { av_vorbis_parse_free(&s); return NULL; @@ -298,24 +298,20 @@ AVVorbisParseContext *av_vorbis_parse_init(const uint8_t *extradata, #if CONFIG_VORBIS_PARSER -typedef struct VorbisParseContext { - AVVorbisParseContext *vp; -} VorbisParseContext; - static int vorbis_parse(AVCodecParserContext *s1, AVCodecContext *avctx, const uint8_t **poutbuf, int *poutbuf_size, const uint8_t *buf, int buf_size) { - VorbisParseContext *s = s1->priv_data; + AVVorbisParseContext *s = s1->priv_data; int duration; - if (!s->vp && avctx->extradata && avctx->extradata_size) { - s->vp = av_vorbis_parse_init(avctx->extradata, avctx->extradata_size); + if (!s->valid_extradata && avctx->extradata && avctx->extradata_size) { + ff_vorbis_parse_init(s, avctx->extradata, avctx->extradata_size); } - if (!s->vp) + if (!s->valid_extradata) goto end; - if ((duration = av_vorbis_parse_frame(s->vp, buf, buf_size)) >= 0) + if ((duration = av_vorbis_parse_frame(s, buf, buf_size)) >= 0) s1->duration = duration; end: @@ -326,16 +322,9 @@ end: return buf_size; } -static void vorbis_parser_close(AVCodecParserContext *ctx) -{ - VorbisParseContext *s = ctx->priv_data; - av_vorbis_parse_free(&s->vp); -} - AVCodecParser ff_vorbis_parser = { .codec_ids = { AV_CODEC_ID_VORBIS }, - .priv_data_size = sizeof(VorbisParseContext), + .priv_data_size = sizeof(AVVorbisParseContext), .parser_parse = vorbis_parse, - .parser_close = vorbis_parser_close, }; #endif /* CONFIG_VORBIS_PARSER */ diff --git a/libavcodec/vorbis_parser_internal.h b/libavcodec/vorbis_parser_internal.h index 691a842385..c0158a210c 100644 --- a/libavcodec/vorbis_parser_internal.h +++ b/libavcodec/vorbis_parser_internal.h @@ -43,4 +43,7 @@ struct AVVorbisParseContext { int prev_mask; ///< bitmask used to get the previous mode flag in each packet }; +int ff_vorbis_parse_init(AVVorbisParseContext *s, + const uint8_t *extradata, int extradata_size); + #endif /* AVCODEC_VORBIS_PARSER_INTERNAL_H */