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 9ED87421E9 for ; Thu, 16 Dec 2021 21:12:15 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6500268AF8A; Thu, 16 Dec 2021 23:12:13 +0200 (EET) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (unknown [40.92.91.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B131A68AF7A for ; Thu, 16 Dec 2021 23:12:06 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Jo0Gs70GvWd5/q7wlUzScsRtBv57ulXfzP/7UxyqHhCxDlSTqfnUmRIYMSHQuoEOq+bRIynHY2l7saOqBQ+sqSeSD5Tp+iPUbhByRoyvQpKDwWWws9eVSu1ojGpWc9Lo3e9JTPzciwpBh46+pZ+i8nPgQtmXu1k7I1bg9W3e++d2vFQXELTTf9dmRbRGhCPfaUOa0kIaIwg/dlYLjxQ0c1HHLQI6R4EFD50N9sa+imCZJ1gY6lA8xoQPQRRlALSbiiDzGOg2ir7aJLEeqPslHUCGYTpsOvntjhOuEs/8S08kzTBI6dFp3+XNMeH9AQCn0dKz0X/Wh0nbqt5z6ZzgKA== 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=pqh6FFv/IM/g70JLtR4DYt6YLYlP6EM7T/Q2QTQoD9w=; b=YiRLmob/mkV2gqHtpBzJn6XIIslzRuZ9lkBOYbljQnWviRJsHxk3sUmftJQBBcglDjS0HgwSMfJIAbj7WczTGHdHwsP04IyNK6Uu9AhE9eYlFChtj9CC78YSV6bf1kbNckmZKkLZ5DXcJYAjm/aiGmKGv7d7oQdmIcOUI60oM5yzttuWqA/rd1ui/VxsjdvTB67yHovmLsiz2pQg0/u+Enfw5ynNHNAfqGmwKysJwFSiD0Sp6eFOxXdae0jiJpGG6m1wg/hx7I4YHfkPxK0Dz7xvMwY2XPWE72pOq3tqRaEJisEGXzxYGOn0GcP0y1WE/P8tsrXpD3g/WWxxSjRnbQ== 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=pqh6FFv/IM/g70JLtR4DYt6YLYlP6EM7T/Q2QTQoD9w=; b=qzdUZE/AsYjCn3vCJVgajTNZK5fimj9HRHWGl1Z+SM+FK0fb4EjmfdtcI0tDCTkYlLD91Guj9ECgraWj1KjXQeyhknXCoRys0gkMSfnPjxslEJiWA9c2NFab+K7MiQZmAg77+8fAbNlGnuJPhqBnlCfFVaZlgoJ3K/Ab7WkQJaqimpwWOtMaP5sv9JndliywvmURG/9Quet7Qh38e2guM7j9UsC29DgpK2Y8jqWr/yANTV3tk1VvTmmSe6PXvZl0nLqbdjrwOdYlAFypmGvpHeI+s55wC0iVQy8m0K77T5vSABQGtGnMj0otPNeEAnQV+qqBESCMdbMQGo3VGtemmw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB7520.eurprd03.prod.outlook.com (2603:10a6:102:bd::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.16; Thu, 16 Dec 2021 21:11:50 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::a017:d2ce:40:876d]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::a017:d2ce:40:876d%4]) with mapi id 15.20.4801.014; Thu, 16 Dec 2021 21:11:50 +0000 Message-ID: Date: Thu, 16 Dec 2021 22:11:48 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20211213152042.5900-1-anton@khirnov.net> <20211213152042.5900-6-anton@khirnov.net> From: Andreas Rheinhardt In-Reply-To: <20211213152042.5900-6-anton@khirnov.net> X-TMN: [n1BACFJH9t+N3RCX7DZKOWTgU+H1awq7] X-ClientProxiedBy: AS8PR04CA0034.eurprd04.prod.outlook.com (2603:10a6:20b:312::9) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <66ca57d4-7f93-9303-09f4-a21d308c9204@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: be6a3ee4-6d76-4567-fb4a-08d9c0d8ad3e X-MS-TrafficTypeDiagnostic: PA4PR03MB7520:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tZPsnrDp3aTOaxW4YcyszPu8bHNcF60E3snYNlWH39Xo36viC3iiYwCk0dq0vdwPqJfjtpPE0v3lbTHNOlsYfrNSJh+z7oI9724wWgUf4GGlMMXOlvM76Mn86Y2hcgXIhzoVJvesFuy2f754VlogeuO3Y9r57fsGOWtaUGk/eLwDQyYEsgr3ukmLwqjxhwBs+q84V4D6Zm0xvfM1bj1iF83L+JavzJGN6zEpAXkUZfyZpQt5vxXgFUEQ5+XtZSwVswI2ShwvAaFejYpCI7bG5xNtb8ImHRmuWhHPK/rtdTcF7OhxsaLhJysCaq7DmVk7fsNrd0E2n5D/pDsrfyntU9U1zuh2AruNUgLb70XMc4KKPXColL/YUulPTSgyrs6XAxy7nR6rSeE/htQI+36aaVsTvoKE8An3NNfNKIqtO79YT7XIYNXUuWZuksDWVoOlpxmSNkatYE0OuenQUJCMX+ukJIJLl82w0w2ciqS7mDgtkh0zCcZ2G5yA/RX01IJ0WemYi8FzZBsQ5/anYLsQ9qaTak0TuoXYbEdByUjDSp7R6vdteU+ojFA+1td9X0u4Sa1qLXQOtDH+xnbJ3HOOxw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?elpRU3IxZWUrb2pMT0xEb0U0WmwzYU1sa1R5YS9mQ1BNT09Zc2N6VWovckN3?= =?utf-8?B?a0FpN2dhbEtkNkF0R3YrLzBMWGJKQThrb3N1OWFvYndlQ2NxazArU0ZGdEZl?= =?utf-8?B?NWdlN05ubVVvdlBSZ3h2Sk9VK21qWnY2RjJtamRyQWFVV2cycUs4STl2ZWQw?= =?utf-8?B?dnUwNHo4bk5DTFh5WXFMSlRCTFRpZUlZa3ZVS3hEd0xUMjVqTk9Sejh3WEFJ?= =?utf-8?B?aWtyUU5ib285bjhEN0x4MUJ0NzQ0UzRjVUtXODV3OTBCTDNzRkFGYXl2ZnJn?= =?utf-8?B?RGoyb1o5TWlWL0p4dnNWSFE5aEU4Wi9pUlZvZTl2WGd5ODN4aEhiMmFuaU05?= =?utf-8?B?OFlua20yZnZjZlJ3WW9kSXBjQVB2eWllK05PVGtrdFlmVHJIb1FTYWJ4QmZx?= =?utf-8?B?bFp0VWJaeXFqYU8vNDc5VjRsUnlCMU5NYU14bVhtREpadHVaS05tQWYxQ0tK?= =?utf-8?B?T0c1bGRTZXdFU2prdFoydXUwYWZmTS9RdFdGQ2VBcHB1TFlHSldGNnRVaGhn?= =?utf-8?B?eVIydjI0c1Z4b1pBVlhseW8rK0gyVzUyOENENytwNEI1ejllSzZkYldTT3Uy?= =?utf-8?B?d1gxYWovZ2U2S2xLMkxmc1JhYTBLS1VwL3BtNWQwVnNMR3o2U1RxUjZVSjFE?= =?utf-8?B?TFZsbEk0V1NCL3l3UWFLYlMyc2hkVVBIWVBpNzZQRUhhRnhYWmpaQ1RYOUwx?= =?utf-8?B?OXlqbTdzcHViSzBVNU1GbmVaczhDVTBxN0tRNDZuSElJQ2lwWlE4NlowV2tF?= =?utf-8?B?aGFtRUhDa3hjMUl1TnhNMGNtY3ZZVWQ5TnJDWW01SHNuUHBXQm43OWZac2dW?= =?utf-8?B?UnJUcDhQUE9EQXAwNXBSWWN3ZWdSaHlRK1R3YTZZaU4xb1RvSjAyUW5HaWwz?= =?utf-8?B?cmlpUXhDeXErMTJzcGtNSThqdng5aVp1UGVHR2JIb2RQd3pDWHNmQ2Jsc0Y0?= =?utf-8?B?eG1iZ3dFT1pOdURnQk1HUFhoY0tNSWk5eHVkcmFGWkE2MGhrNmh0cWhUYlV4?= =?utf-8?B?aUFSUmRxZHJOU1hxdjNBdW9HdXZ3UHlGczRVMG1aOEtraFRKSHh4ZlQrWjdF?= =?utf-8?B?UGlRSmdBS1BTTE5HYXlOY3N2citNSkNhR2Vubnd0Q1JXRzJIU1FzMThKUzVR?= =?utf-8?B?T05aTWF6U0M3OXFBNGNqTmhhOWY3Mms1SElPY3FVZ3ZYSmErZVl3T3IxMWhv?= =?utf-8?B?RytySld4QlMxaTBmRlJCaGNYMEhLWlZESDBjWVRIQmc4N0RJSXh4WlBIbThl?= =?utf-8?B?ZFpuZ1phZ1ZqY3J0eVBRbE5VRnlZa3pGc3JoMGtYWmtZeDE3QT09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: be6a3ee4-6d76-4567-fb4a-08d9c0d8ad3e X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Dec 2021 21:11:50.4792 (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: PA4PR03MB7520 Subject: Re: [FFmpeg-devel] [PATCH 06/24] ffmpeg: move writing the trailer to ffmpeg_mux.c 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: Anton Khirnov: > --- > fftools/ffmpeg.c | 16 +++------------- > fftools/ffmpeg.h | 1 + > fftools/ffmpeg_mux.c | 21 +++++++++++++++++++++ > 3 files changed, 25 insertions(+), 13 deletions(-) > > diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c > index a00fe58063..1fb10869b4 100644 > --- a/fftools/ffmpeg.c > +++ b/fftools/ffmpeg.c > @@ -4436,19 +4436,9 @@ static int transcode(void) > > /* write the trailer if needed */ > for (i = 0; i < nb_output_files; i++) { > - os = output_files[i]->ctx; > - if (!output_files[i]->header_written) { > - av_log(NULL, AV_LOG_ERROR, > - "Nothing was written into output file %d (%s), because " > - "at least one of its streams received no packets.\n", > - i, os->url); > - continue; > - } > - if ((ret = av_write_trailer(os)) < 0) { > - av_log(NULL, AV_LOG_ERROR, "Error writing trailer of %s: %s\n", os->url, av_err2str(ret)); > - if (exit_on_error) > - exit_program(1); > - } > + ret = of_write_trailer(output_files[i]); > + if (exit_on_error) Shouldn't you check for ret and exit_on_error here? > + exit_program(1); > } > > /* dump report by using the first video and audio streams */ > diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h > index fed34b06f8..91c313d8ef 100644 > --- a/fftools/ffmpeg.h > +++ b/fftools/ffmpeg.h > @@ -686,6 +686,7 @@ int hwaccel_decode_init(AVCodecContext *avctx); > > /* open the muxer when all the streams are initialized */ > int of_check_init(OutputFile *of); > +int of_write_trailer(OutputFile *of); > > void of_write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, > int unqueue); > diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c > index e7c6ddd8f8..fec8537506 100644 > --- a/fftools/ffmpeg_mux.c > +++ b/fftools/ffmpeg_mux.c > @@ -291,3 +291,24 @@ int of_check_init(OutputFile *of) > > return 0; > } > + > +int of_write_trailer(OutputFile *of) > +{ > + int ret; > + > + if (!of->header_written) { > + av_log(NULL, AV_LOG_ERROR, > + "Nothing was written into output file %d (%s), because " > + "at least one of its streams received no packets.\n", > + of->index, of->ctx->url); > + return AVERROR(EINVAL); > + } > + > + ret = av_write_trailer(of->ctx); > + if (ret < 0) { > + av_log(NULL, AV_LOG_ERROR, "Error writing trailer of %s: %s\n", of->ctx->url, av_err2str(ret)); > + return ret; > + } > + > + return 0; > +} > _______________________________________________ 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".