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 485C34A731 for ; Thu, 4 Apr 2024 19:33:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1217968D159; Thu, 4 Apr 2024 22:33:53 +0300 (EEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2108.outbound.protection.outlook.com [40.92.73.108]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C570E68CF79 for ; Thu, 4 Apr 2024 22:33:50 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OswVMIb7ReiZKrHC64sBGbP2fklFgfj8tKd4rlGKzsw4UEiqL22X2rGsniyy+CiQsUyZeetiDgBag673xwyPET3uHuqsImi3MLwxlIh72TY64Mw7UBGiupUzc4SlJsDiE9Oe1zg8sMZd1M/owZjNueN7VDn3K+BC4CRTPMFSDiwHe8wC0zjhquvLQCtYutJg/+QJxJeta+TuJgCqVgXPQrg0dkE2aIyXgCHALHzg67perNpqc0354hgmRgRNlxNhI5BTYdePI78foBWtWh14rOaG5ZPziv1EplfJEUdgh02ZoLvmI2t5yboEEN8qNCYNWIsc2PYK4gHiHgYDy0T1Sg== 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=HUSAC2XTK+umevxgURwI345pH9iJq4uRr3HhwUpcBXg=; b=cQgeNxM0XVNueIc3q8h1sZcU7KmnsqiVROzxNVDRbGDvfcb44eP06dTeg7HyoQPlmLm3yhbcWURBg/ezIk3z2dBhEfEth+gbrjHCrS1SUVQjkAf5aP8EG2nkoaAI45pNvtsdOrg+j4MpkHCQEvja4vv6JG5U4enKvLqOQG5SVRwUKOPJNg7zVdEHbKB7OsxsdmqBLkmdJ2SY6kaOfA2pBZte00Zb4D2v/zBSrE7f+EFNANxaL4qWH6O7fKqq3J6U6CrD0x4oOEM23S+awoyeTirrgVJx6XooYXM6YFIXUawC8c0WRquhks0wbTGZ1j9KZLmxd0l0fAz0HxC3zfcAqA== 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=HUSAC2XTK+umevxgURwI345pH9iJq4uRr3HhwUpcBXg=; b=cXd03+lVPjGHDgTJNmuOmJJNkKNMcYxwWY4xRUtZJzOWNbmL+q/REnRBHPtgOPHQMqjEpc/d67Xt6gdUhNR8RRiiCP/i//CYJatAMxAX9o+60V8ze0Yelxo39bK3aJtyJS35nSScLHEp1MHUuQmT+sifYN0/bsnvoAZvO0ZR8PbigBr8vBWJfQhbfY6JutTPRIC3xVZ4tCdx11LFaX3xnJH44RI+3TnFP/X4p439mNijelOigkvxLmgd0nd7vYzZp32xXKyxq6AGE+2z19ysHGn1EBFs3Q9DqkTt1ApJElVluLN4AObalVM/doIzvu9Y+3GcDjurPzakt7noV8iJxA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0148.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:275::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Thu, 4 Apr 2024 19:33:48 +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; Thu, 4 Apr 2024 19:33:48 +0000 Message-ID: Date: Thu, 4 Apr 2024 21:33:46 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [18a0CSHess545mPt0DII2PZJGu/BUGWGo6njn5JptXQ=] X-ClientProxiedBy: ZR0P278CA0009.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::19) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0148:EE_ X-MS-Office365-Filtering-Correlation-Id: 79e59ac8-8b5a-4dc4-90d1-08dc54de2656 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lw9WlEMtcf2KMq6+Tb0jjsC/Dgn08KwLwrp6b0+7Li1MYuQUHV7f6NTNpKXnwuoB0VTKONGS2he/2G8Rp3a14EiV2euyejkb9d20VQht6nru3253CuFyZSiUryJ7ZjR+k1N7kgyH2lCJg2IoX8ZFf+QFqQsvGYOwvPoA50+oElgaT/PG2FxFPxlLQxWwH8EaPykPO052asIBlF3pZpDkEWEHgE+IcjVNjjLWT1QY4o/NkDl4vtjPvyAKnw07rSv6prJbZbZn6kXOi4hLOMG9BSjJfFjK9o1OpIL0ht1FUUls8aYrieMtl9MBbJEbphS896cCXwPra584YnYsqq5o2wnjgvHslyZCZh93feiJa6dRl7AL+CZ6wA2wwiTCHRxsEVJiL9ZHy14YxSEMdIMSlIp3SOCTlcQ1Y2u3TQJ434klAjGAwK5ixAh896VWK4JuOjdxQ/FBnqbHvo2ZseIcZ49HOsM/FSFp6hEtIYYN3a8hlDOTHvaBSi7fKRoGCEVEA2wG6QsySc7984FMQfGvtXfD6uI1IBvKoEKXt4o2jKQzZ3BHQ9mDg3C0uNCwUoL3 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SVBkcmg5YnRoZUVUbTZvcEViZmpYSEl1VU5MZUtDS0cvcm94VFlhaE0vMkhT?= =?utf-8?B?eVB1MVdhTDdTRitYR0o5NEpzZHpueUpvcEdmazJzcWZKN3B6bGlDM2F5bkEw?= =?utf-8?B?N25reUNnT3ZOeG5wbWpld2huZktjeDdza0N6akJobi83WTJxd0ZJV2xqMUxr?= =?utf-8?B?ZjVEcnRzMjVnVDJ3bzVYaUl5Q09Rb1R1a0xDdS8yRk55OWFubTVMOU84VWR5?= =?utf-8?B?cFZLWjUwWXdQQlNhcUo5bFpWZlFJNS9QN0ppdGVFS01aMFVGRUg0Rlk0WUc1?= =?utf-8?B?UDdZUkoySjV4clp3ajFDZThJV3JJUlBHU1lWK2YzaE54ZEVmUG9kbVhjMDN6?= =?utf-8?B?TmkzNUZLUncwOFhIR2tRRUw0OFIyK243aHZ2VFkwWmhwRGh5d0J0Z3VEaTZY?= =?utf-8?B?Tk9CL3o5OVJiTGE1aldacW54ck9NSEtxeVpnbkZGU1lxNnRXY1owNXJBbExW?= =?utf-8?B?c1RPeVBoa2c4VFdsZUNJbUFiM0FjS0Z0K3IzejBVTFNSelRrK3c4MWxPR1p4?= =?utf-8?B?UUNSYmlKakJKQ0N5Zm1hbm1iZUtpQmdJQlJUOWx3d21JRUx3eWIxRlAwMUU2?= =?utf-8?B?aGlHcno5MmdPNEUwZE5vVmNGY1dJV0lkTC9zcGw4Wjl0TEc1RGdUSmpJRXI4?= =?utf-8?B?UytBOS96emVsK3BGdllCcEk3SjEzYm51aXB0TVJUZ1greHJoelpMcHIwWENo?= =?utf-8?B?WU5OV1pPQnk4N2h6NmxKUFRacHVVNlVLS0thMlNVNnh1SEtJdi9FZko1djcr?= =?utf-8?B?QU9ncS9NbmZFVTVFeXNkN1Q3a0pFSFVLdVhUbGdYclkyWnRxMlAwZ09oeFVU?= =?utf-8?B?ZlFBK2k4STA1N0o5S3pxZjdXTVNvYWVUSDFZdlAyMmxvNUdxdFVhbFFYOGpp?= =?utf-8?B?TE5MVnNZRHdVVGhPYzNldmpTWWMzUCsxUTNyNGdQQ2pLVExMVEZ0M2IxYkpZ?= =?utf-8?B?UDJia2EyeHN4MVRDaVd0MDBtUDViTVBzNWxqRFpMZDhHQWNRNFVwRlVsWU0w?= =?utf-8?B?VW1scnREeml3Vmoxd2dXZFdOVGxCaFF6cG1oODNtM3RlZDR2RGE0bE9LUjFU?= =?utf-8?B?NDZYTDlPTkZNNjBYTjB2bjdiVGtuTVR2SCtaYWRlQTU1eE05a0xsU0Nrazg2?= =?utf-8?B?dFVnYTR3NmpSejlvdjE3dEJJK2I1VTNKQ1pYK0tmcnQ4QUNhUk5XMERFTEhv?= =?utf-8?B?RkU1a1R2a2VRRzBxdDNvTGdaVEJnSXN6TEtVbWk1Tnp2bTR2R0ZrZ2lEdmxD?= =?utf-8?B?YXRudjdqT21MbnFRRXhmYm1mNlNlOFoySmhkczBaMG9SM0E1WjcycmJ4bmts?= =?utf-8?B?TE5Kb0RGRU9rYWtLcjFmSDBzSVRZbS9jVUo2UjNqdGsyU1RvYm9PYVhpbEZo?= =?utf-8?B?VEVQb3Q5cFFlUU82T09ySkJhWjArZUZBZ1FWbkxPQXFrbFR6dVpxaER4UFo2?= =?utf-8?B?aDUxR3FYUE5xZUVCalU3aW1DUnVROUpscS9wYTl0c3RvZ3BHeFIram9XUkdo?= =?utf-8?B?WEgzUjdwNU9wWmRuNHNGblhoT2Y3MEFRYVpUbFQ0aVkwRGxOdkdBK05wUUJK?= =?utf-8?B?SUpnOW9tcDdVMnpHT1ZXTnVDcVFmTXQ2MlBLVkdjTWdmZ1poaktwVUxiMlQ1?= =?utf-8?B?NWVJS2szcU9DbkdFOXhiZEtzSUoxaU9GOSt5TW8xZDR0Y0hYZm1oR0pkakYz?= =?utf-8?B?TVpwSk1yZkh2UmZYTG5SRUtMbGxjMnFhQlorLzg1dGVUWVRYbnhIbmhBPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 79e59ac8-8b5a-4dc4-90d1-08dc54de2656 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Apr 2024 19:33:48.4419 (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: DU2P250MB0148 Subject: Re: [FFmpeg-devel] [PATCH 9/9] 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)); Sorry, sent the wrong patches. Ignore v1 of #8 and #9. - 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".