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 E2991447B1 for ; Sat, 23 Mar 2024 00:09:48 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8B64868D15B; Sat, 23 Mar 2024 02:09:45 +0200 (EET) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2100.outbound.protection.outlook.com [40.92.59.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1987C68CBBC for ; Sat, 23 Mar 2024 02:09:39 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gASRIe2wTPj1oWvF12hcLZGaExFSlqCQ1ncQbuytzbw+uNsGRjMWhVh9EcoPKivVwsHasJwDvC38RMJKg7VuLRDJM58QwcWtlA2y8t0Wpo+F1skKbIsOpkUNgZnKr0B387CWBp/8qL+Y7d2N66SKB+PNDpDlKlsQuiSbFAo18pPjAaMkfScq7nckZqXqXx1CwaJfCz+DcN8iD98gj4I07DEh6ishhmp3bmTvKKi97ULJ3D5/+IyTRD/2kTBDbMWBWtr1V0hLaUANK4H7PODPHppQcNolLreCOZgTVVYlvEBuLSsp97rCt7fxetQjEfIZUL8t4s0Fpp9nbfFgfjcaQw== 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=NMdv0ssh1aGPvsIXLA93hU1MpwpcxYiJjoL5TkC/7wU=; b=Wy37QO0YgWFsALX2ns7KsgMpS/+LuMqcovf4G5p+FfzOVJwQnWnccrh3fFr6mhXgTC9LjRqIaDUBxTuZLBd4NukPC5xFkZxuVVn85fniKoKFiwm3BUE39ylqPe25RwXE6LRPIrpxhFojdmoj1wDRdjnKuYxOxP6rY7+cNv2s7yB7RurvsmRfBqwXe1S+Uov4rixqzI89fO9BiQJanGhw9S4IfVOFeYUOV4Ofc6lo4UVF92oI4h7jH+rJ163KaRxvk2ewChkR+oU64ISWqyVWR2B3ZpSClFgWYpdYvIOWnuqJJ2n534gBhsrOLK6192GeU2WazZR3JCz7/MK0k5IaLg== 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=NMdv0ssh1aGPvsIXLA93hU1MpwpcxYiJjoL5TkC/7wU=; b=AhOrnN8j5N7p3dQcmfC07mUD0wSpnE6XlYR3DLnvt4goWsKtMmyYo9tzz7cJFUxbdrC3auwaT1Hc+iPehc7OdmAlk4movA/WGjZrh2O6+5MxF2gvYggnOxocmFYeWoiBT0GbAF2NE3BqEhzCmLTMHgB2AjQIVQ+9vykFCyY69Fz5WUaGCLc2HBdi8x2XQwRMIf+pRJaz5qKdUdCVnaJIYhfvaeHCmizM+xuP7q6ubSvU8reA3pe6ojXDIKjcIPCfVOEeYJ3EHz+aHpWji9ervlQk514LSViXmwiSlqwqjPRQXGt1z9eRdATK1r2sx/IDo/gBv9SUo+S7Ik3sN2I2rw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PA1P250MB1065.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:45c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.15; Sat, 23 Mar 2024 00:09:36 +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.7386.025; Sat, 23 Mar 2024 00:09:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Mar 2024 01:09:27 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [6x7W1MgUTC8TRrO1r1QQo9lnVYidMWgPJ3g/UfeUbow=] X-ClientProxiedBy: ZR0P278CA0026.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::13) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240323000927.1335596-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PA1P250MB1065:EE_ X-MS-Office365-Filtering-Correlation-Id: 3d860da3-1ba0-4ca8-621a-08dc4acd8683 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NdTveCBqEm4zpvJ+gohWt9ZlRPLPwadnIsxU9LENBLnRVQa64ZaOE5TK6LeawNVx805pnLl2VjIIGnNaOs9UaNHs8khY3jnSjUShG/RbjRicqJfR8CB91Cmsan16zK9CrNhQwA7JYjhLZTXj1Xkaa6/2zLSOWYx2Np3NaJ0QufbbU8i6XYKmL392dOzJbOY4cUL3HQkx0vSKMjADVAI5I72UEIv3lvX9lgZrKNJ0e2ViBRP1xugNR/+TkT6o4VWghdrmuq9kPW+Yh5eFsBOJ8uKYRU0oYB18tkNF+/WfAKNDuTTUV68vH6hM24iLbjfVBQMfbEIDxoaSsXzq4LPgDFqK7lSWsSyJ8qJIKI07UDlfzww/U4pjwvQ1DXoTMntS79tNMDXlkYq2O21XYrj4jAwXW9uq9ilL+ezs83vL71BGIRbdEkDQ08ejz63Qnbvz0rQHEjd36BSeuH9Cs6HICL2Fe4H+G7+HgZ0RdOnKxasjbPx/zFwLszZ7Z//nEyfzQthgyE+FznvfbDXGMqlZOZ54M6jrih6/85IsJSLqqSp+Ga4xLiPjF/CoHeNNhBKFEX5uG3uyj1C4TGefMdyC3yP1xkL3UnkKArK8+Zm4BNM= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?J6XBoPalMc2WS9IgaK8WkDq0p7Zezi65tz+5vzZ0Q/EIF5e91H1q4VGXy/I8?= =?us-ascii?Q?WGm4kFzLXvmnnUeAGW9nQ3Uo+wS25Pe023ad+e9wVFrVtKdmeDpB08CXjAU8?= =?us-ascii?Q?edslkTvpsyWQGRiQSwI1h3LkH6tMM8IbBToM9999s9R28Up5Due6pbcPivz/?= =?us-ascii?Q?W3gBHzXBIpk1oY4Q4QdMI3eLFrTZqqPQG1e8170T3aNZGxqHj6UqCBPGcKcD?= =?us-ascii?Q?QoeMVQfDRniUmwXgv3/bqo+UY2tG19cy06r/LjM44dHZEgVQ4jpN/29uPa2p?= =?us-ascii?Q?WiVnSdhZZat+REdrWy1OIblL+1lumS/fr+bBZ8+7mrTeUKRnTFmhOBGF+BgB?= =?us-ascii?Q?Khl5oHBWtvk5M39tZaeU8viTy750zYip4r18FKBPmDDYZMLsGaQSQNNzw0wx?= =?us-ascii?Q?29eDTnw8I18MUZmPaTI/yn6g9HQPZNgn6lsxvmE6UAugWgYIqqlbDFrNfh9h?= =?us-ascii?Q?lCva9zatWoG69AUelSEjL+1H0gGq/cexUHswRaP02qGyeOz7vqaLvXoEjGXg?= =?us-ascii?Q?hG3braO7+iRmucTbLpZLETIgtxTpKwvFmp9Neyfm8bY+F166BKgi5gdc9qgv?= =?us-ascii?Q?gppV9o89YlYJuEcqHny7ZYLqTJy2GW9mfEKKEMh6GKYZXGootDucNQsLF3wf?= =?us-ascii?Q?eT/hROSabhaNAl6hRybVNb3e49hQW9NUXJLuLUUsONaAI3+KjSrF4wgynrhD?= =?us-ascii?Q?PElkF4fAKre7Q1yCAgIC99/1yRVn24ivRFDk6eIxKJXl2kVzxB53vn9VcDQY?= =?us-ascii?Q?bPnB+yi+FYc4XSMIGtwHqtt8bCTAxFIFXNIaF3DGPMttCh8Hwx4EmFH4WD/G?= =?us-ascii?Q?HKSlPCBaAIe8W/XBSgMrjqOfytvLv46Hn/mG6gowwUxwkgf4X7GYbLc+dvxD?= =?us-ascii?Q?DZUzkTTxCxuZ8o0wTk4smUBGehwZDMt+z1r6M6kqp1SGYuniqwNkfTB9+0lV?= =?us-ascii?Q?x7lyLRZ4n9ajMZD0nVAmdKBjc9+uD3nsuUStcBedqqJCCilImYTL4lMJp2/2?= =?us-ascii?Q?JY/xqAajJ4C7IPyNsndw5xG1WkK34o1SxLVR3HOIOsWfjz97tCE5z+ERckds?= =?us-ascii?Q?0k7kyZ+rePpUaFutErGT/5W2I65Ik0sMhhaawi0DkbhIt+jPGhlqqzXQfFMy?= =?us-ascii?Q?e8ojB5wu28qD85rZsroZqCUGOPpiA4Q7kaDW8QNaQ9o06aO69FVMiC6NfsYx?= =?us-ascii?Q?7NQC2Y9qtH/D0PiVHnAwxZgBosm7O4L4MScH1a+WC4VqK8LNNuvc3O3Vtpi7?= =?us-ascii?Q?eMUI+1PrV7xbA3lbwdRQviefSv2+uxZtAoDln14Uzg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d860da3-1ba0-4ca8-621a-08dc4acd8683 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2024 00:09:36.8087 (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: PA1P250MB1065 Subject: [FFmpeg-devel] [PATCH] avformat/mux: Remove check for AVFMT_ALLOW_FLUSH 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 Cc: Andreas Rheinhardt 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: Due to the bump it is now certain that all devices that support flushing have the proper internal flag set. (Notice that the check for LIBAVFORMAT_VERSION was wrong.) Signed-off-by: Andreas Rheinhardt --- libavformat/mux.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index f23eb0188d..630204a8ec 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -1236,13 +1236,7 @@ int av_write_frame(AVFormatContext *s, AVPacket *in) int ret; if (!in) { -#if FF_API_ALLOW_FLUSH || LIBAVFORMAT_VERSION_MAJOR >= 61 - // Hint: The pulse audio output device has this set, - // so we can't switch the check to FF_OFMT_FLAG_ALLOW_FLUSH immediately. - if (s->oformat->flags & AVFMT_ALLOW_FLUSH) { -#else if (ffofmt(s->oformat)->flags_internal & FF_OFMT_FLAG_ALLOW_FLUSH) { -#endif ret = ffofmt(s->oformat)->write_packet(s, NULL); flush_if_needed(s); if (ret >= 0 && s->pb && s->pb->error < 0) -- 2.40.1 _______________________________________________ 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".