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 88EC84A76E for ; Fri, 5 Apr 2024 22:17:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0806C68D157; Sat, 6 Apr 2024 01:17:23 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2052.outbound.protection.outlook.com [40.92.89.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C6E6968D112 for ; Sat, 6 Apr 2024 01:17:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ffg0G1NyrEVALSCULGbsH5XIX2UHVq9MnorT9e1rIvtsiu3PZ2tRbow+Apbfwhhjna1OfJ2Cp8cJVV/f3pBZIG3qs+t6wElcRBguYDO1OK8tYTGO/ijOQ9H7TqqmEJ0Sg7A+++/zv7t90YKUqqRe13mQ4Jume8qj3bUFAujH67VcBn9FDQ1HttbS17vXWVenJ9FILsbF9PWiItw0F1IKhYJAyRdgtoSAigP5fzrzcqNLvtYelkBReT65DauYgawHW80MeYhpUcEeveewoUp8dbERMDwrXFrskERV9E1TZTqWifssE9fd81DFQt/k+0sHVhdrTE256OmgYJC8uifMhQ== 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=oCeVTbKLjznIRPF9ReW6SikmV0O0SxgouNd9tiSzyUk=; b=dMlBATS80Ziiul6Cx2FrwK8O+rqsvnhd1yGCoZo4h1Yw4ij0tDTO+JCPcVjOX7s9ulKlepwLh7VsB6ot06z148GPEbs20S1URMT+ghhBTBQqo0H7b+dvT9DKrzA6J7dOK/4va2Ybiw3TijT+guNfr4lw+0F7+4/oWjmQWrhfwR8jiBkUtW6P+pfNJE1Qnpq87RnQgHw5XTaYeBKsPi5SXSSpmPst5Ww5Pbdl7i2w5Q55FnSCayWVVsLJoyqrfz+4oGULCx63EPDTpxm0365sRNW4Zq4aiPHcGQM6Hghpd3kFzYPwwPM12vPkchezd9esrBugLHrhljIYLtcEhLFysg== 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=oCeVTbKLjznIRPF9ReW6SikmV0O0SxgouNd9tiSzyUk=; b=M06gpR6tF4Sp1hCZ72r3JboOevoP7aVScTOJXgYcCTpmSjvHL8pKKS3/9j42H8DI2MTh53dlgr0AEf5k3zR7uxwg9MKxwxMHMl3WAutSK7XK+uaUkeQyrqg88xECQNIknJ13JgIZuQKAzq7ERMU9PIHjDG3T1mje2xxOTCiyqoER6hR2p4GCbA3g2W1EOdT/wKMoiQDK2kgtFFT+fdcBitlwsOX1jTz98cWhSXeAafPgNdZTfyIwYWfTbWn+y6zlEqR9PeY1JXZgBieBslNIsShV9NFAnArURv0fKpUT+Lq+pei7hd3CmVZnAkaOaqHh2ixYMaz2HTPJVok8700QKQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PRAP250MB0540.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:297::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Fri, 5 Apr 2024 22:17:14 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Fri, 5 Apr 2024 22:17:13 +0000 Message-ID: Date: Sat, 6 Apr 2024 00:17:11 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [Kn27Vj4ZTTOWLjwYkmcDXRu3FfPhMoEiqdUIMGx4egc=] X-ClientProxiedBy: ZR0P278CA0107.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::22) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <33ab42a6-2729-48ff-9608-f01d906afa25@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PRAP250MB0540:EE_ X-MS-Office365-Filtering-Correlation-Id: 3891599c-657a-4ec1-2696-08dc55be2549 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: o5MKywKijKoIjc/Br62PJA3NI60kG1T240EiBPDIMeiW4VcA4NoKO1xyZC5w2B+J5fRZZ6Rvs+8m6idOnVyO1xLBsrHF2T6S/Xx6l+BPojBHQNZrSN9akbxbN2kry3J1AbkmiphMsXy15cDYrU6/WjPkQRXM33bgE7kNTn/wmuOGXHE+jG2MezcOi6Tbw3QKg1I8L1X///Jz7MsC3FvTI4Grb2bFxcZHIf49nlGjORxwM2+nyTdsOxIOQlklwV9/+ivH3JqX6Ks2THWOuuNqCyh5wwTICkhlpEZbP1j6V0Z8HXCGnDInFLXglf+XRrPgsGL2H8Y8R+p5UEGVjXeaS/QL8nuaX6ON7kQ8MT59sT8MeJylysMGLGCfHgFtcSuTWs7QFIhKGTjWxuK7k5ZImY2vwWXLQX4IhJIFUfMWR83w06pavkzVZY16c90+2zVFUuT/YAer6w23EQ6BERu+ZE2UFz3fjiu6JFmBbXkPu0HyVWUxpc1eiH3xgmsKuvc/uZw6GvYQQQo477Z25tZ1SNQehCZhEgGuAPW3vVbg/ePXRwbXGg/wXe1W7my2AaMI X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Y0pSL3dMQXpaRTZQL1FPZ1NGZk9qZ0RpM0owYmJDYkpmOHY1L1J2ZnV0S1A0?= =?utf-8?B?b0tWRG1Hb1MweGlaOFpIMllxWmJZSjRYTVVjbU84ZXhhdG9CNm44R01LM2Rv?= =?utf-8?B?aytaNnQ1dWozbjgra0FzUWlGUlBRWmFVY1psWk03bGlVMWhESmg0VjAxWkNu?= =?utf-8?B?djhLc2Z3T2ZqZjdhdG9IZndXSEptQ0FtZ1dEMnJUMWdSWkh2MGdwVnRGUHRp?= =?utf-8?B?a2Z0U1dDOWFrQVNpbGc0MEt1a2pRWlJZWEUvMlVvVy9WeW1pYVhQK2lBL2tB?= =?utf-8?B?cm5Ba3FiYjhaaHhhUjB2RGhTMFhZYzYrNUxnT1cxSkphRVE0cmNOSWFlSnR6?= =?utf-8?B?VXRoL1k3SHdyVjVnZkl4aEoyVnNnUnFjOFg0YTRHWWlEM1lMZmwyMStGeThp?= =?utf-8?B?M01VVjRVSHNDNDNSMXZPMUUrOVRWY1A0L0NVb0FTcEtLMmNTMW1Ia3ptRFFD?= =?utf-8?B?OW1yZC85bEVKSjVXcWJoM2VUNnE2RzJ3YkF5Mlh6d3ZwNkM2VTl5c3BTWnVP?= =?utf-8?B?SU42REdybWozSG82cHc4MitOaE4zZVEyd2R6OUpMSlo5Tlc3MzBRbjN4NHF6?= =?utf-8?B?Njl5ZzhXN0E2YW9TM0xVQXJLenV0MUhkUWlqcjBlMVlNbENnVUYyVEU0SnVY?= =?utf-8?B?djY1c1NzSTIrUEFxblc4YnhPWTN3Z29pd043aGF5ZEJEM1lhU1g5VHkwbGM2?= =?utf-8?B?R0xHVFlSWGVaK1RzMnJkMWZxUEN3NWhCQ0N1STlURDI0QlJXODE1c2k0U1pE?= =?utf-8?B?Um1QS1hRMXY2RGZHMTNuVE5QVThRYWZyWnBPM3NFKzJZbWhBdktCdm9Zb0FJ?= =?utf-8?B?akhhVml6VEZQWjl3QzdlM1hLZnlxRVBpN29JbzBpTlZCY0hBV0txSURpZG9l?= =?utf-8?B?QkNVUWg5dXpLb0kwTkRIM2NEbEVmUkFzaVI4bFR5ZXQwSWRZTVk3cVNEVDdW?= =?utf-8?B?T2dJbSt1WkN5ZWxQM1k1RlNYQzhnY2h6YktmV1B5VkNiNnh2WGJUMGppMWNP?= =?utf-8?B?Y3FVTmVvYUtTaVJ6MzJ4d1dZV0tUS1lhWkZCbHlNYm5qNXJwNmU3MHdrWHNk?= =?utf-8?B?a1grSUQ2cDhLY3ZjWHhxNjFMMU40WGVFN2ZXQ051UE9MUVhTbXRqTERjNFZL?= =?utf-8?B?YmVrbEkycGRNNzQvVWFaM2JoYzN0anpkdE9WSlB4Qmo0WG1UdzQrOG05R2oz?= =?utf-8?B?TzBBTEVVWnh5VXkxdjJBRzZRTytKUzV6cG9WUzhqSjQ0NnBMYUNodHp5Zjk1?= =?utf-8?B?M05saWdJMWk1bEViaHdQVjBUZlZTWE5WR093L29hbWNlZ3Jha1hwSExBSDlK?= =?utf-8?B?VzNWQmlZRGllSnN5MjNObndwSDVPdmZBTE8xMk9xeWxyLzVzbW1zT0hWWlFE?= =?utf-8?B?MnJhOVRGM215MEdvUkJ3VFNzc3huanl1bUZJSWZlZW04cVhQcXFDMmZiTTNL?= =?utf-8?B?ampQVEc4ZkVkcWYzWndGSmFlcjlFWFY0VVNzLzk1NHJpMGVQeVZGanhkVDhx?= =?utf-8?B?cXlVNWNTSHIwUldaZmZreTJnOTZjYzE5SGJLaXJpM0dPSHJSYnJzc1NtczRN?= =?utf-8?B?YU92NXN3Z2dwSjVIQ1ZsM3hQUDBNeDF1akhHMUphMTdTalV0TGp1ZjBzOHAx?= =?utf-8?B?NCtBdHBiMGtKT1VLRC95a0xWTGRvNlFvV0NPMjUwQmVXdFJ3UGNHRmxETFZY?= =?utf-8?B?d3Z1WGM4RGwza3d2VjBzeUJBWW02TTEwcGVLTUZVT0dVbkZ2bnZpSkVnPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3891599c-657a-4ec1-2696-08dc55be2549 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2024 22:17:13.9321 (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: PRAP250MB0540 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/dv: Don't pretend initializing work chunks can fail 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/dv.c | 4 +--- > libavcodec/dv_internal.h | 2 +- > libavcodec/dvdec.c | 6 +----- > libavcodec/dvenc.c | 6 +----- > 4 files changed, 4 insertions(+), 14 deletions(-) > > diff --git a/libavcodec/dv.c b/libavcodec/dv.c > index eb49978ad8..194d982562 100644 > --- a/libavcodec/dv.c > +++ b/libavcodec/dv.c > @@ -166,7 +166,7 @@ static inline void dv_calc_mb_coordinates(const AVDVProfile *d, int chan, > } > } > > -int ff_dv_init_dynamic_tables(DVwork_chunk *work_chunks, const AVDVProfile *d) > +void ff_dv_init_dynamic_tables(DVwork_chunk *work_chunks, const AVDVProfile *d) > { > int j, i, c, s, p; > > @@ -185,6 +185,4 @@ int ff_dv_init_dynamic_tables(DVwork_chunk *work_chunks, const AVDVProfile *d) > } > } > } > - > - return 0; > } > diff --git a/libavcodec/dv_internal.h b/libavcodec/dv_internal.h > index 4b4151c88d..05e26a8138 100644 > --- a/libavcodec/dv_internal.h > +++ b/libavcodec/dv_internal.h > @@ -32,7 +32,7 @@ typedef struct DVwork_chunk { > uint16_t mb_coordinates[5]; > } DVwork_chunk; > > -int ff_dv_init_dynamic_tables(DVwork_chunk *work_chunks, const AVDVProfile *d); > +void ff_dv_init_dynamic_tables(DVwork_chunk *work_chunks, const AVDVProfile *d); > > static inline int dv_work_pool_size(const AVDVProfile *d) > { > diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c > index a06e4807e7..9e8d40187d 100644 > --- a/libavcodec/dvdec.c > +++ b/libavcodec/dvdec.c > @@ -637,11 +637,7 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, AVFrame *frame, > } > > if (sys != s->sys) { > - ret = ff_dv_init_dynamic_tables(s->work_chunks, sys); > - if (ret < 0) { > - av_log(avctx, AV_LOG_ERROR, "Error initializing the work tables.\n"); > - return ret; > - } > + ff_dv_init_dynamic_tables(s->work_chunks, sys); > dv_init_weight_tables(s, sys); > s->sys = sys; > } > diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c > index ce21247081..3afeedbb87 100644 > --- a/libavcodec/dvenc.c > +++ b/libavcodec/dvenc.c > @@ -93,11 +93,7 @@ static av_cold int dvvideo_encode_init(AVCodecContext *avctx) > return AVERROR(EINVAL); > } > > - ret = ff_dv_init_dynamic_tables(s->work_chunks, s->sys); > - if (ret < 0) { > - av_log(avctx, AV_LOG_ERROR, "Error initializing work tables.\n"); > - return ret; > - } > + ff_dv_init_dynamic_tables(s->work_chunks, s->sys); > > memset(&fdsp,0, sizeof(fdsp)); > memset(&mecc,0, sizeof(mecc)); Will apply tomorrow 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".