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 C959642EB4 for ; Fri, 9 Sep 2022 23:44:33 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 312AB68BADD; Sat, 10 Sep 2022 02:44:31 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2056.outbound.protection.outlook.com [40.92.89.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3CBAD68B73F for ; Sat, 10 Sep 2022 02:44:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tb+ytN0EuyR3u/smoanRN/y9bN8FafNbwMEJKg2ZSsM0BioitRfjfjGH7T7Sn0V2xfDdS0Cz+tsoRD6x2lSKaf8EGaQne7UCiB9T7TKaUwludQ2Nnrma7QMeJd8msvoDNgsqxaL1vM1Q6Lf3HbGU++9sdneEIJ/0dhtY6BfjjauMtYV1ziFnxTHInbnVqv9WBIvaLa+JgWJr76HiKPOftd5s0/yiexd+fSplDcUPHIhroEn+mb0bpinXdM2IeQm00Rnj322wAGdhZIbjVaOs08EAFuyGBU6j8rPEYb+gtvpJ8BWt3H+NyAY4LMlP88OUjusJz/sJ21UlRlavbrAecA== 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=V/fZMIfwEtZcqTz3aIRLtnw2xfpWz1klB3BSZLEyEfs=; b=GvkGXIsMhiJxzbfM1FzxEf8F/9aCzEmxW2/M3dA4Qn5HQ+bNdEaHWuEoKtCM/1buly/vbFKxLuRk83LsaJAjk2hWh8zPkRtS3ICayHUF0aXnd7n601zh6zv6UfVVqqxAUAJkRIIH2Y7qaSM/o8ygwAdzpPsNhKbWHz5bvmpB8ybONeR5HqzVJBeYwgNeR+GF4viJ/09GXOiTSw6VyENlBeyONGo+m4kbilnrGddzJzKkcnnQ605wchsoM5PO8aT964sX5lwGI+yP6dF5pKG5VRP4PVqm4ewV5zrn+1w6uesUu/GX6Khyi2RlJ3LGhCspDDt4BUl+vuGtpGE9Nl6dDg== 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=V/fZMIfwEtZcqTz3aIRLtnw2xfpWz1klB3BSZLEyEfs=; b=MTcXdfC8JMULkmaUhPaaKwms4fzf3DxK/8eAAVtxv6AQBuYbt35eZ6iEY5+QxTrjM05SsQWqC+fMpPAz+Mb5RNRoe2B6vjZOtUD8hv78z3nitqRUZskLJtI8gQZIe3lnEWyTuQRUfix96nDML/EX/e0bLVwIZU2gKGzgZesODJQda3jEe93VJgW1RlM53amCnEdsZPZqeqNQOKPpzc4c2yzr5atdBrAI+MPwU1UgSZys+j06tcQTXRcAnF1pIK5QUchf7Kzd6hXcSl4wWjrlNxh/G5H/9acyKxFQWl5lYL3sPvDI/Td7zB+MFTGDq3t5xBGPXiuGQMsFkchgGOYiaA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU0P250MB0843.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3e6::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.19; Fri, 9 Sep 2022 23:44:22 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::611e:1608:45cb:b58a]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::611e:1608:45cb:b58a%4]) with mapi id 15.20.5612.019; Fri, 9 Sep 2022 23:44:22 +0000 Message-ID: Date: Sat, 10 Sep 2022 01:44:25 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [FYWEx86Qu7aOawLJT1JHgESQY0C3tVpjC0URi/t8dD0=] X-ClientProxiedBy: FR0P281CA0119.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a8::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <3d6029a0-32c8-0883-4960-8c786b757582@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU0P250MB0843:EE_ X-MS-Office365-Filtering-Correlation-Id: 8f27a974-9ae2-4c5e-5898-08da92bd38bf X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ODP77JP9XgPlFYvDIpLYQYalu8TFJd7U4op6/nfLyTfN9K6GpHqqGS2O/fQ2c5dAW53zaBh+UatjISY+HMPIngqdv7LL2E46KGGkSQA44JxFZD+hhFgREaZOVWRSTZLJFJ/Eq7pN4Wd07SzBV6eW8p79nZQqrLI4S3qPES12Ft0418IsTua6MBnE2juj2pQZbyFAsPPgzm7c/l2hRgk7uaxu6dzi0XkrY+mDqZDErubr68DTIv0FSE4GtCYxHsJsw9JP7vzQFWqBo1w+rXoWs/KeYeAZpkVWQ2qMzjJwtKB63vPXpXbx7KdqtDmBt/59E96ISLckDj3wgwZz98cjrrfh/zD8Mbf3UdtQ3I3PmE7jhEVDpMKZ2S/54/WWJcEYN/Jh+pcrV4JSAs8NKtql59CQ3uuHbIM17r9rgcujoF0ktyZvEJqlVrmBzT+hf9yLzQ1fg73LQNgvtjUZuFFh16D5e0jxeKcm2/0fO/FXaTdg/MwHT9vae66eDrNFNrtfqZNwIooiw5vtuNKGPNhSr0qOGOcbbE/0AMNRb2sQHCk/nhkHkAjUjxh8AgtRhsyRrx66xWgUFBIUOiKS/NKqQ8nktCV9WDZGySI5f96JANd/e9KBJqJdNXJeqXdMLjUf0LDiUMLBV2U5jSV6RdCwOMmGVPQw3KEIDbBs4ea9LVgfKFvuGqEsU5kh6mahkj1O X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NEdPNWM0RzZBK2plUEZrTzNoV3NCNjU2VjdLVjZzZExZbnlvUkUrR2RYd0RW?= =?utf-8?B?S3RhNG1qaHVLY2hCUmJzQ0RhY0djc1lvR2U1RS9ia09Tckt3KzNYSVo4UnJy?= =?utf-8?B?NFF4aTA2RGhMb25QbVI4Z1Q0UTZGR1BPeU1ENTVYdkpkTmU0MFpXRmUwdFJQ?= =?utf-8?B?cGsxY0U0NE5NZzUyczJuMkNZTEpRZ2czc1IycDlDMVZsTXhLT0FBcUJFMVRQ?= =?utf-8?B?bnZPNUtuY2RoamNiS3VacEdOa1hndlNGSnNZaCtObGV2UVhWTUZSeER2bFl6?= =?utf-8?B?dGtXT1pBdlgwU3V2eTQ0VTBYOFFvcGx1VnhwbzYrUERkcEpoME80TTQzeGlO?= =?utf-8?B?WmlQNlh2NnRJUjZXdEFJaVZOQWVLYnE2T2p0NUpLUFJFL3RuYWppdXRrRnpG?= =?utf-8?B?L05qc29Dd1RvOFB1SFFVOUwzNE9lUXplcXZFY2hzdU91SEQ1bFpUT1VjRHNR?= =?utf-8?B?Yys3bkFYYUdnMGpad0N5VUxkSkdaOW0zcEh3aUY5TlpPbmc1UU42TXRjOFEz?= =?utf-8?B?MmxIYUIvSmVCMjR5UU5YTlFGUXhJZzJCT1QrLzNzd1owaWtOVjdzWWhHbmdo?= =?utf-8?B?RGY2aEpzZ3J0QTBvRk80TGVTTEw4VDFPRDdRVm9VQ3g1WlRxOWhkeVBuSGhS?= =?utf-8?B?NFFOOFIvbFBYK0w2MXlLR0lkZ2dRejBpQ0kyVG5GY2Z3NE9aazlxUFpta3d2?= =?utf-8?B?STZHQVczR3M4TldlQ1BaWlBSTmhqOUxPRlRtNFRlV3dNTUxFbWZhT2ppRDZP?= =?utf-8?B?YVhGOVN4cm54MjFYRnZDWUIyRTBrbGFpWXd3NjlIeDlwdWNNaVlDWGZTQitE?= =?utf-8?B?ZTFIbDJnRkpQZUU3WUJQSHAwR29xUzhLWnVoVUNuVWNKYWRhUlltbzNyR2M4?= =?utf-8?B?QTl0YW41LzBvVlJmTlllQmNRaUVGcW1kTlh0eGgzWXdsN1pvVS9NYjZ0N3dl?= =?utf-8?B?aFMwQjFkNERqMjRQZklPZkZJbHR0UVV5bmU1TjZUUGtrcUtXdnNidHZ0bTM2?= =?utf-8?B?bllJMHJCQXc2QWwrek5vWGVGSkRYa3M5WHJZT1BMTjRzZEV5WmRnT2ludmFQ?= =?utf-8?B?WmJSOWZ3ZXBWTDk4SU1sR2g3NjhMcmtueEZMN2tnaW1rNUw2dVR1N2tLMWxr?= =?utf-8?B?NW02dXVFR1BjaldNMlVOME1ZMTVtcW0yWHdoc2s1ZHVoNHZ0Y1VzUHVSdnho?= =?utf-8?B?Q3FuQisvVFZ6WWRxYVJESnNnc2dTUVE2Z0RhYjI3cGc5Z2ttVXIrN1g0UVMv?= =?utf-8?B?OWJ2UExHcXIxL1lCNjBqOUE5SEkyaGlxU1R5aGhKOUlXNDMvZytqQmlweDVI?= =?utf-8?B?M1I3T25PdDlva0xhVGdWMUNnU0orVzcxOVIybVlNaVpPZ1c0NDBRclh6b0Rq?= =?utf-8?B?QWdVenVGTHBmMnRLUm5SdjI4MkJzbTVrbzZCTENBM2hBTWRJS1hlWmdma3hI?= =?utf-8?B?ODRRNG9NbUYrS3hONkRtdGhyUHV3YXRVUitLbW1peTFOK2pha0lBZVBKNnZ5?= =?utf-8?B?MGRnTlRnOHNrM2VzQVpHOHFQeXBTQzYxSkxyQzFHRkNEZjVKQ282a0llSElk?= =?utf-8?B?Rm5HWHg0UHZmR0kybnBCYkhXZnBDVzM1Wk5yT1R0UWhoeldtOTBPU2hzSDMx?= =?utf-8?B?OWFERzg3RkZZRWswb0FPYnp6VHgranExVGFmWGF3RmhxN3E5eHhrb1FLaXZJ?= =?utf-8?B?ZUdFdzl5T3VRbldDenczV3BlUTNoV0ZoR0pYUExBbFdaKzdFRmRBaDJJeGh6?= =?utf-8?Q?jb97htEUGPCmBOgzzMDjXFiPE+CQNtjuB5XR3NC?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8f27a974-9ae2-4c5e-5898-08da92bd38bf X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2022 23:44:22.7228 (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: DU0P250MB0843 Subject: Re: [FFmpeg-devel] [PATCH 1/2] avcodec/ralf: Move frame allocation after error checks 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: Andreas Rheinhardt: > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/ralf.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/libavcodec/ralf.c b/libavcodec/ralf.c > index 20c5f060d0..8f8e49f535 100644 > --- a/libavcodec/ralf.c > +++ b/libavcodec/ralf.c > @@ -451,12 +451,6 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, > src_size = avpkt->size; > } > > - frame->nb_samples = ctx->max_frame_size; > - if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) > - return ret; > - samples0 = (int16_t *)frame->data[0]; > - samples1 = (int16_t *)frame->data[1]; > - > if (src_size < 5) { > av_log(avctx, AV_LOG_ERROR, "too short packets are too short!\n"); > return AVERROR_INVALIDDATA; > @@ -481,6 +475,11 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, > ctx->num_blocks++; > } > > + frame->nb_samples = ctx->max_frame_size; > + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) > + return ret; > + samples0 = (int16_t *)frame->data[0]; > + samples1 = (int16_t *)frame->data[1]; > block_pointer = src + table_bytes + 2; > bytes_left = src_size - table_bytes - 2; > ctx->sample_offset = 0; Will apply this patchset tonight unless there are objections. - Andreas _______________________________________________ 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".