From patchwork Thu May 19 21:40:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35838 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9992:b0:82:461d:f3b with SMTP id ve18csp290255pzb; Thu, 19 May 2022 14:41:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwocjuwtJNx9YbCS3fPNDNATx70Gr46PYgy5NVUzYSH9uoYjm8TF/DvM9OAgA2zzbc9bKI8 X-Received: by 2002:a50:fd95:0:b0:42a:b7ba:291a with SMTP id o21-20020a50fd95000000b0042ab7ba291amr7538451edt.247.1652996474963; Thu, 19 May 2022 14:41:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652996474; cv=none; d=google.com; s=arc-20160816; b=ZdiXlSWYcfZkZLumSnB8mbrjewd/icVYeHsM/RWfkABnJiDq9BU4ErFCxk2aGgvLJi nWiw/E00oVX/WNXRm8hDfSQCC9oDA69af7b2n2AwB2DnfCQeOm1sega7B+qmvWWsRuwe DNeNf+q9OEhrN1Ym8S/woOkaHDOJu3z39bCY/ZkOQVVTqb1ci4TNQlcarmSzD6qmGeXu kxgeW+8H+WZo0t81Pwc60UaXRinL+94CRVFqAfebM6O1CAA32v3q1OOMSDvb72cXq2PF g3pm03sQmxEIppQgpqbZwhoI9Hdz2/GpjP5ns8ZIOp1+vqjFsai3qKjKebbEJF6Gw9hX qxmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:fcc:mime-version:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=oLUPMJqm877P8P0n72DiyzW7Wi2in0O6Y668jHxCcoE=; b=wAkgM796GiERC3R1V+AabQgdobdktsGGALaPS13oUl5KcgPmahZXXiJWQQd+mKulIS jQnQnRIpXtgMLC9IIAmTtfrl6jwpeYsO+ZjLXB3EnoVm9IYTI6ifIHG5meKm5cMX9v6e +FyT6clXTjfj8RVT+dSEd6NLTz5jXz4kG7ILJvhjFh1o5bULqYBTGCuW2GFsPInbQUft Y8EgMpmmtfSGZWhzl8g3xjWG492MtPQ+BO1YAsWqwRSw+yWkk9acryjXVmLoJwR/1nAl EdABauqG6CccD3PcKZUrf/M8mJQBtsqhf+Fp8kJGCv27KAuSmNa96dSnFX3YpD+xYWqK 9EBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="HO9/zuHo"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dm7-20020a170907948700b006fea58580b7si1068842ejc.354.2022.05.19.14.41.14; Thu, 19 May 2022 14:41:14 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="HO9/zuHo"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0A8D968B4E4; Fri, 20 May 2022 00:40:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B476268B43C for ; Fri, 20 May 2022 00:40:42 +0300 (EEST) Received: by mail-pg1-f177.google.com with SMTP id z3so4661239pgn.4 for ; Thu, 19 May 2022 14:40:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:message-id:in-reply-to:references:date:subject:mime-version :content-transfer-encoding:fcc:to:cc; bh=kqtCgudik2DTTyfv57EODSabvG9o0Wlz4Rz0Y+f5CjE=; b=HO9/zuHoUIgxc0HBL11fbzVfgYpVOHLuQFrUOFtLCz/aPYlF5Pl31pe2gzg8MLkqKh MPuOxAraeZyJqPRvda4AscxoBY/godgs2EcG3HeIvkgdudHXo0M8ZkDMZbHGHuYB6hWb JjwVxD12/7Z3XeWA/iCgu8PxXsZAp3nDO9ysB5+9KBzPeirkpJKn1WLEebKJh/Q/joCi CoST7rceztmI6yn4vgsCUCS3S+1q4IciXFXPSp6qwraxCCTX4Becj3yah2lq00FuR98w TQQFf5M7uGrmfNcqF2Oopqz6Euwi/Lpgrq9bxsjuV2VeGe+B07t8l6YrD2Ii1IfiSjwP VFSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:message-id:in-reply-to:references:date :subject:mime-version:content-transfer-encoding:fcc:to:cc; bh=kqtCgudik2DTTyfv57EODSabvG9o0Wlz4Rz0Y+f5CjE=; b=G4qtibZpewr806L0FbsVZtQfNLYvy63hXhoF2lNCUG2c0ZsFnACPtRIqgSFMsfA1hS 56kglW6oTozL0xqTWIjie03bUzZ5p8CSGRaXd6H3Z5pp/rhV0OT7DCyjeMIvDxTrW6IN sq05SUhKmCWnKzJTOvT2W/UhM4r7SO4Rqq7PaAJW6wF9x7pPwSCQhnFmDi4jtRNxFXK2 JtZixjATk6TsmSVj1AP3lSMIMXGVhwBhtirIMzMgke2dpFvbOR0ZI+zA8fToKicNRSPr bHeTU03PIQUl4wgCDOq30DIdu20T8h6nRX4q2XM/fICedcdV0MDlScp5f1tEGNM9bOL4 tuEw== X-Gm-Message-State: AOAM532m8vyds1uC3M07cr5esOKF9B3itM6imr4jjc43g/VtrNje/KIL BJuMRqYCCEU8DdNceFrhAnP4u7MIJ4YA0g== X-Received: by 2002:a05:6a00:2295:b0:510:635b:5eee with SMTP id f21-20020a056a00229500b00510635b5eeemr6784048pfe.20.1652996441154; Thu, 19 May 2022 14:40:41 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id n10-20020a170903404a00b0015e8d4eb1dcsm1636981pla.38.2022.05.19.14.40.40 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 May 2022 14:40:40 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <5e50103af3138f088fb18ea1edd85db9f30f52e1.1652996437.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Thu, 19 May 2022 21:40:37 +0000 MIME-Version: 1.0 Fcc: Sent To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v5 3/3] avfilter: Make avpriv_open a library-internal function on msvcrt 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: Martin =?utf-8?q?Storsj=C3=B6?= , softworkz , Tobias Rapp Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: q/HLCkTSJCqW From: softworkz This applies the same change for libavfilter as commit e743e7ae6ee7e535c4394bec6fe6650d2b0dbf65 did for the other libraries. Original commit message: Add one copy of the function into each of the libraries, similarly to what we do for log2_tab. When using static libs, only one copy of the file_open.o object file gets included, while when using shared libraries, each of them get a copy of its own. This fixes DLL builds with a statically linked C runtime, where each DLL effectively has got its own instance of the C runtime, where file descriptors can't be shared across runtimes. On systems not using msvcrt, the function is not duplicated. Based-on-patch-by: Martin Storsjö Signed-off-by: softworkz --- libavfilter/Makefile | 1 + libavfilter/file_open.c | 1 + 2 files changed, 2 insertions(+) create mode 100644 libavfilter/file_open.c diff --git a/libavfilter/Makefile b/libavfilter/Makefile index ee2ea51e69..78ccfa37d3 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -23,6 +23,7 @@ OBJS = allfilters.o \ version.o \ video.o \ +OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o OBJS-$(HAVE_THREADS) += pthread.o # subsystems diff --git a/libavfilter/file_open.c b/libavfilter/file_open.c new file mode 100644 index 0000000000..494a5d37a4 --- /dev/null +++ b/libavfilter/file_open.c @@ -0,0 +1 @@ +#include "libavutil/file_open.c"