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 1BB944220E for ; Thu, 16 Dec 2021 21:40:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C8CFF68AF9F; Thu, 16 Dec 2021 23:40:39 +0200 (EET) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066062.outbound.protection.outlook.com [40.92.66.62]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 09A2268AF86 for ; Thu, 16 Dec 2021 23:40:34 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C5iUoCVlkyhwHD5ifPHUMfVpeOIeUUy8sVZJFRMv8Q+hZehh7YLS4tHSKgo0l6TIfWfRD+r6GaU5AK0OhWpI/q+LQCucKNY+tUpGOfwh/6LAIu4FyR6trwcyIiPPK+S9ZIDgPXzZvQTMnPHCxB92tKAbngbIcUL4auHzT2s4AJNweyrXRKFcEqo+C2phB+dYy9slg2nMaAjYdk43gnLTC9LPg5hKULAVht4kro0HVdaUZ95/cSZc0FttHpeeq6ZrUycPoYHxdEXlwMicDRJe+PH/137v9NJylK0DKci2P30iQJCy0hqISGkbBUyFEbou8D6xdkC5HtO0mkeesjI+rA== 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=xX9HX4Jlsx5fL98D05YVGdpn3y6Ms8WjJ9qub79nu6I=; b=jGWnuzBAHTm1wz+XM71Bets50OFSxOdheD7+P7xWS441wlFZl+l+0YaI7V9uAmYMj72dSbz8nxo+T7dFtaTOC4zOrF4/Di8XPjRUdzO6aX8ZZ2nxTgyljp9AAnGiUM8xYce981De/dldNtBU25/q6/BoOSvw7sn6lsVEGdii3Jw7tbGDO8pKeKv+yCftzjpzGvBmgxmlvyqtFGVmjX5AdK1ZyK3x/+1Tm3y5AYMMnPqORiCNutpgrIBaN608H1XTUHUBRuRtGdaHyE+wuZUZAH7DSDC0EgQq0bEd20gz24T2/3Li72Cq5UebPB7b/wZY0B3usUH9Yg0UsSd9yHHfnw== 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=xX9HX4Jlsx5fL98D05YVGdpn3y6Ms8WjJ9qub79nu6I=; b=maL8W/4PfMt36KkJxU2aQsegDMMQT8Dcuejoh1tt+aIKaU743MmIa5RyOB17VG+6GgiBUWLJS2zTRYmD3GFYzSEsKvjhieFE6g2Ikk7ex0xy2D1n661nJIuZ4sHYW8jYpbP4EWS/bplPHMy4mrTie4mYGqAMNRCxnuTYjQyx2asXZqnVfLl56MMEqirq80k8q7tBP4kUx6kgWbqWaRwNqW1KoyLWapQYbfu8CKUlXWiDCLwsSrFcblGeIhKLc3+Gm3211hSr4pYaIZ15xCXM7Kt8B5Bs8AsRRPcODUUb5yLSzYfI+co8/+EpF1orquDKRHIB4jYnqbCM3wTm5YQjWA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6402.eurprd03.prod.outlook.com (2603:10a6:20b:1b7::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.17; Thu, 16 Dec 2021 21:40:32 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4801.015; Thu, 16 Dec 2021 21:40:32 +0000 Message-ID: Date: Thu, 16 Dec 2021 22:40:31 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20211213152042.5900-1-anton@khirnov.net> <20211213152042.5900-11-anton@khirnov.net> From: Andreas Rheinhardt In-Reply-To: <20211213152042.5900-11-anton@khirnov.net> X-TMN: [KZE/fx9raqqMZ0WaznGZzJHSYIYp2Yom] X-ClientProxiedBy: AM5PR0402CA0019.eurprd04.prod.outlook.com (2603:10a6:203:90::29) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <5dc5703a-b7da-9668-b669-ab0bc90d3a80@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 57cbe100-7ca5-4de4-4d87-08d9c0dcafce X-MS-TrafficTypeDiagnostic: AM7PR03MB6402:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T26LH5+OS6XP88f4NTnx3PxmdYZSJ/V9WL9XWAfA1SBjPp7+GqlpW7qo145dTbAUzS65ccsrC6nuj8DRRCb4bfhkVxxtTFzjb/lz/VddcFPcFrX1YF0e+Ng8yJltLgQFW134fKmBjrddQJohAqfGF4Kmkmmf+LrBwDv3qbie7mTJJOh+q+e++EMEM3HV8PFuxxrmh/WSPg3ZjlgIIqzWpM04Nb0IgAXE9MK9W+OI/HXI9WsjyVnciEt1Z0HTr00705pSz69RrGk6q2pmdAks/DS4nAQZ4CF6IiisUE7mC0t06ZsTOC4JlBbixSDSRELbyK6CyvJdxcB/ceEC/1jumTngkv3eP15LPMxDw7URjMA/83uwi1tduJbld0Q56+5PeulGP/k1TKHlVQyz1ipk8xUvnXH5QwNUlGNPIg9ZX2mVwOepFtnjWI7eYiIXfrllidd12jTepk8CjcWf7pmkpcbmqjwQVGQ8HNsVtO+ab/7RVCYi7BnkveToSzQDgTEZAp4NKsm3sPpZi51rdlVStkP/e7LHPvYwQwP5IGhS9NDb1Hhru3Xt283L8ZAWUj2WYzJW9x+x77Iw+2EN/xFhJQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dXBiTVYydEt3eVlvYVo0MW5nM0tnQkJ0amJEblkxNlBpOEljL2ZiZUZOdHp1?= =?utf-8?B?Tm05YUJoWHdFWXUyQzBlN3hyOUpzTU13WFFicHlhY2FQRG1Sb2RxOGZNajRH?= =?utf-8?B?U25mZWZ1Q0xlNEFkSFBQMTk5VXBIb0pBU0tFSFY3TVMxazIveTk1SFRnQkkz?= =?utf-8?B?MkE0Q0p0L05Ma0xXMHljZHlBNVg4UStZSElvOWs0YWJWbDdRKzdYdXp0V21N?= =?utf-8?B?ODVXOFFFT01PYVBaNUpidWcvdjNUWXFoa0FGcGVpT0IwVGh2NHJzZ2t3QUdD?= =?utf-8?B?TjVkUHFIOUg1bktTckxmV1ljM3BjeFF3aFZXdE1KZ244OTVTQlFvMUk1Q0dG?= =?utf-8?B?Yi9sVWs5a21KRStVOTQyS1hVM0Ivclh2RU45NlNWOEZ3VFJ3c1RsMkw4amhq?= =?utf-8?B?MnJtV3B2UUlRZVR4VDYxV2NrZ1hMeTQxR2lMRU1mYjZJZEZCYlFRMURLZDMx?= =?utf-8?B?S0lMNkJKVnB1dHEreE9ZbUhuL1czdW12cERDSVRhLytqdkVVM1dQeXc1YTF4?= =?utf-8?B?dnV6VERueGQySDVRZnhxbVdRQUhMNE1tT2QzVCtLekdpaytPMnVtbklpZUNI?= =?utf-8?B?Nlc4OEZTWmNPV1d1cm1QMEVRS3d2Q0MwVzh1VUl4d0RJcG0zRllIekNZM2kw?= =?utf-8?B?b2dKbzFaZW1GOVdrSHU5NXAwcUpuSTlEZ1I3djZzMnBMRWtoclhHN25Eb3ZO?= =?utf-8?B?ZTRySEdnSDZpM0RLTm1KanNyZmszOVRQaWVlZHB0RjgycU9QZW54cE9ZdE8y?= =?utf-8?B?UTNCMml6N0tXaE5sWkg2UGVOY1pQTi80QnRPTU9qN1ljUmdZT1cwb2o5TStJ?= =?utf-8?B?Sy9vYmN6UW9HZHBLR2gvc0FyMnBQSm9QSnJmREltUEVtMmxiRFN4UjJkTTV4?= =?utf-8?B?dklFR0tMWmF5MS8xejErc0YyQ2haUllvWHpsS01jeUVBbzRLejZPdnZYVWxn?= =?utf-8?B?UlhqZ3ZiNXVCRmNNSkJWV1FncDBpbWRPdlNiVi90SGRDeUpUOStoeWFzbG15?= =?utf-8?B?WWE1VlNKYlZXZy9qMTVPb0dYTmttMjRjWEdRSmIyU0lFQUNrODVzNlJ1Z2hZ?= =?utf-8?B?bXpscGVPUU05TW5RVHNFVS9hUDM3WEY5U0RTaTdsYXFITGFkT3R0aE5rRHNS?= =?utf-8?B?SG5GZFc1Vlh4V01JT0RGVEN4VWdMQ1dRNkU0bWp6ZnZGMFYxOG80VTBXSE9z?= =?utf-8?B?ZmdWb3FGVFF2amZsK1FDbUFyN1FLdDBTV1MrT0x1ejliNUJwS1VGeEtEU3Ru?= =?utf-8?B?ZjFqT2JpY2Z6eDlseGpJT0ROUXF2enJ4L1lZUDQ1QUx5dHN2QT09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 57cbe100-7ca5-4de4-4d87-08d9c0dcafce X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Dec 2021 21:40:32.6537 (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: AM7PR03MB6402 Subject: Re: [FFmpeg-devel] [PATCH 11/24] ffmpeg: set want_sdp when initializing the muxer 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: > Allows making the variable local to ffmpeg_mux. > --- > fftools/ffmpeg.c | 9 +-------- > fftools/ffmpeg.h | 1 - > fftools/ffmpeg_mux.c | 5 +++++ > 3 files changed, 6 insertions(+), 9 deletions(-) > > diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c > index 3ed1201fda..f76e5df8d2 100644 > --- a/fftools/ffmpeg.c > +++ b/fftools/ffmpeg.c > @@ -138,8 +138,6 @@ static int nb_frames_drop = 0; > static int64_t decode_error_stat[2]; > unsigned nb_output_dumped = 0; > > -int want_sdp = 1; > - > static BenchmarkTimeStamps current_time; > AVIOContext *progress_avio = NULL; > > @@ -4557,7 +4555,7 @@ static void log_callback_null(void *ptr, int level, const char *fmt, va_list vl) > > int main(int argc, char **argv) > { > - int i, ret; > + int ret; > BenchmarkTimeStamps ti; > > init_dynload(); > @@ -4600,11 +4598,6 @@ int main(int argc, char **argv) > exit_program(1); > } > > - for (i = 0; i < nb_output_files; i++) { > - if (strcmp(output_files[i]->format->name, "rtp")) > - want_sdp = 0; > - } > - > current_time = ti = get_benchmark_time_stamps(); > if (transcode() < 0) > exit_program(1); > diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h > index 67ff391334..4aed24c2a7 100644 > --- a/fftools/ffmpeg.h > +++ b/fftools/ffmpeg.h > @@ -646,7 +646,6 @@ extern char *qsv_device; > #endif > extern HWDevice *filter_hw_device; > > -extern int want_sdp; > extern unsigned nb_output_dumped; > extern int main_return_code; > > diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c > index aba4b563a4..e6417cdb8c 100644 > --- a/fftools/ffmpeg_mux.c > +++ b/fftools/ffmpeg_mux.c > @@ -38,6 +38,8 @@ struct Muxer { > int header_written; > }; > > +static int want_sdp = 1; > + > static void close_all_output_streams(OutputStream *ost, OSTFinished this_stream, OSTFinished others) > { > int i; > @@ -349,6 +351,9 @@ int of_muxer_init(OutputFile *of, uint64_t limit_filesize) > > mux->limit_filesize = limit_filesize; > > + if (strcmp(of->format->name, "rtp")) > + want_sdp = 0; > + > return 0; > } > > This variable could actually be completely local to check_init_output_file()/of_check_init(). - 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".