From patchwork Wed Jan 5 12:21:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 33084 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp673731iog; Wed, 5 Jan 2022 04:21:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJya9mXoTVDEubk7J5okZWM1jlshDIRaHApOQMuz8F9KQIrdTkzve7j7J9sOjFjgqbhKF9sB X-Received: by 2002:a17:906:5d15:: with SMTP id g21mr41622842ejt.350.1641385284874; Wed, 05 Jan 2022 04:21:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641385284; cv=none; d=google.com; s=arc-20160816; b=UWwwE+AlIlMPBxPw3pGFoImzeaiqSyPuyNNkl4wLRBI/CSd9zbDGWOh/bKom5Z7fHP SaflIOA61E4I0d8f/veTN7FAxpyK1UKRT8BgAdVwTwiGkYPonBkhWCI+vla+600hfp5a 5VjEdxlgDK84wOdphELD5UwHHBcGy3gWeV0ArZ4/JgPByj+Ju3TvGpad04Z0ig44Ssqk JF3SGC1zB2yJMgwkF+MNrljSTkuIT9uceAilh8PWbrF5+bxiJtp3fXJxzOsDU76/PTvU 71OBCImtWlF2SOH1yz57f08pRoudP68kqYVo4Tv2M0Y0NrhwjwDFpy+zIAfYOHXBzWtH 3zjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=Aw135j6thNy5Re6CLpLLAajXPMpVKcRS5GgJOgT8ddI=; b=t4cO+qwBIi0LNDNz0kc1Q0kx9eKUBYj0GVEp86RnlResZPkrBAOrrCyjT2kCtUrezi Mh5H72ecKbP5soBn2vT/jvJUDADcm9nD/a1Vd8z3KsUrFL08svnMdyMR2/PMVpZ3EzLb MN/8Bv1TOEsbGcrh3yt96xQALi6fODS3FzGjqDp9Fh+q03ztdSIJU5kqKRiDxgMEkCC7 ohbkOrYync8fXnf8rB8d6Hkame7YGIpGuhS5CN95p+Lb71mxb3UDj9MvpxBGGmBxX8l2 If1I5xRAedP8Py4SvSfdHhmHt2LDnx/b5DOqn9Km7wrhkrUnectiEi5HNC25TYrb2l45 e/zw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b="kne/hMP/"; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z16si23806388edm.469.2022.01.05.04.21.24; Wed, 05 Jan 2022 04:21:24 -0800 (PST) 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=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b="kne/hMP/"; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BFA3368ACF5; Wed, 5 Jan 2022 14:21:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D8E5668AA6A for ; Wed, 5 Jan 2022 14:21:14 +0200 (EET) Received: by mail-wr1-f52.google.com with SMTP id w20so73606351wra.9 for ; Wed, 05 Jan 2022 04:21:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=VQeuHi86mOJF5ZrfLUp+C5ub/ubkx5oD2I+1hRi0q9s=; b=kne/hMP/1/2MSo4SyVHsTeMfdAcxAr94nHz8Ix0Bb7aEr/mLrudKtmbzKZVKpAnQLy A9SJVggdQmuSS8uCbEd+6bJGrnD9SRgT6z344ITGO7H+g3EwBDNn8lt7qMoBt1dFP01U fkH5XNXshH9eQ1Q+1tLfDpihNqF79opl4KPqLS217+tBrxseB+RU/uJiptvUB2MxMhAo +LtTEG7tw8EZitJCKMF9LHFSS7ld7wZOms82aFNQNa4TH6e/HNb6PttoX+v8Sn4Pczb/ 719TqnHr4Srd17L6lLzhQd11tCPhdxF/T9q5d6YueUrO8Qc7FOqSixvNi1cwBoJVCq2l exDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=VQeuHi86mOJF5ZrfLUp+C5ub/ubkx5oD2I+1hRi0q9s=; b=nOV5OjC79bF3hciGEYDECxVdmDCkT6B91EXewIeSXJiSQTLBub87o00ehbth9Zj4yQ ieENOy1ykTFw8bWOWUx8Bc5HXCNTQ8gw+Ggo1QsUrOtXh0rdOofijdMaAso2OHThwroo YeE93IgN7uEUDCWSpSZognaMtpJocV7EpuX+IGxTS0htj7RouT4kgZ9shCicrOz/ZX+a d/K/xHhTV3Mb4KHIecbuJgrrIJR7mhKCxILQyZAONgGfG9ejfcdnwtFZtFazeya5LLqZ nKKP2pLkHP97YULIG4GOisAlKWpKQafuRR6sPgNoiyrWm8DdIux5fv2hU8LmhFQW9Ady Z7TQ== X-Gm-Message-State: AOAM532sIBYmO/hdYiRR0/pGTkNPl+5yxHn5oicloEF9DddjvtG11f1q Z24WQ1+qs5elRhz438WH626vl2KdP02Cllnk X-Received: by 2002:a5d:47aa:: with SMTP id 10mr46689902wrb.455.1641385274294; Wed, 05 Jan 2022 04:21:14 -0800 (PST) Received: from localhost (host-97-187.parnet.fi. [77.234.97.187]) by smtp.gmail.com with ESMTPSA id g9sm3149792wmq.22.2022.01.05.04.21.13 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 05 Jan 2022 04:21:13 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jan 2022 14:21:12 +0200 Message-Id: <20220105122112.30960-1-martin@martin.st> X-Mailer: git-send-email 2.32.0 (Apple Git-132) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] windows: Remove the VS_FFI_FILEFLAGSMASK setting 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: cVURcIbfSG54 According to the documentation, the VS_FFI_FILEFLAGSMASK mask consists of all the following flags set: VS_FF_DEBUG, VS_FF_PATCHED, VS_FF_PRERELEASE, VS_FF_PRIVATEBUILD, VS_FF_SPECIALBUILD. The documentation of these fields say e.g. this: VS_FF_PATCHED File has been modified and is not identical to the original shipping file of the same version number. VS_FF_PRIVATEBUILD File was not built using standard release procedures. If this value is given, the StringFileInfo block must contain a PrivateBuild string. It doesn't seem like it's intentional to set all of these flags (and setting all of them at once doesn't seem like something one ever would want to do anyway). --- libavcodec/avcodecres.rc | 1 - libavdevice/avdeviceres.rc | 1 - libavfilter/avfilterres.rc | 1 - libavformat/avformatres.rc | 1 - libavutil/avutilres.rc | 1 - libpostproc/postprocres.rc | 1 - libswresample/swresampleres.rc | 1 - libswscale/swscaleres.rc | 1 - tools/gen-rc | 1 - 9 files changed, 9 deletions(-) diff --git a/libavcodec/avcodecres.rc b/libavcodec/avcodecres.rc index 4b69686177..094fd27eb2 100644 --- a/libavcodec/avcodecres.rc +++ b/libavcodec/avcodecres.rc @@ -29,7 +29,6 @@ 1 VERSIONINFO FILEVERSION LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO, 0 PRODUCTVERSION LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO, 0 -FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL { diff --git a/libavdevice/avdeviceres.rc b/libavdevice/avdeviceres.rc index e13e73d57e..c74aa3f2d3 100644 --- a/libavdevice/avdeviceres.rc +++ b/libavdevice/avdeviceres.rc @@ -29,7 +29,6 @@ 1 VERSIONINFO FILEVERSION LIBAVDEVICE_VERSION_MAJOR, LIBAVDEVICE_VERSION_MINOR, LIBAVDEVICE_VERSION_MICRO, 0 PRODUCTVERSION LIBAVDEVICE_VERSION_MAJOR, LIBAVDEVICE_VERSION_MINOR, LIBAVDEVICE_VERSION_MICRO, 0 -FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL { diff --git a/libavfilter/avfilterres.rc b/libavfilter/avfilterres.rc index 8be62473e2..e0437186a9 100644 --- a/libavfilter/avfilterres.rc +++ b/libavfilter/avfilterres.rc @@ -29,7 +29,6 @@ 1 VERSIONINFO FILEVERSION LIBAVFILTER_VERSION_MAJOR, LIBAVFILTER_VERSION_MINOR, LIBAVFILTER_VERSION_MICRO, 0 PRODUCTVERSION LIBAVFILTER_VERSION_MAJOR, LIBAVFILTER_VERSION_MINOR, LIBAVFILTER_VERSION_MICRO, 0 -FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL { diff --git a/libavformat/avformatres.rc b/libavformat/avformatres.rc index ffe61e0d80..911b2269f2 100644 --- a/libavformat/avformatres.rc +++ b/libavformat/avformatres.rc @@ -29,7 +29,6 @@ 1 VERSIONINFO FILEVERSION LIBAVFORMAT_VERSION_MAJOR, LIBAVFORMAT_VERSION_MINOR, LIBAVFORMAT_VERSION_MICRO, 0 PRODUCTVERSION LIBAVFORMAT_VERSION_MAJOR, LIBAVFORMAT_VERSION_MINOR, LIBAVFORMAT_VERSION_MICRO, 0 -FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL { diff --git a/libavutil/avutilres.rc b/libavutil/avutilres.rc index 40a75eb377..e12f63db9c 100644 --- a/libavutil/avutilres.rc +++ b/libavutil/avutilres.rc @@ -29,7 +29,6 @@ 1 VERSIONINFO FILEVERSION LIBAVUTIL_VERSION_MAJOR, LIBAVUTIL_VERSION_MINOR, LIBAVUTIL_VERSION_MICRO, 0 PRODUCTVERSION LIBAVUTIL_VERSION_MAJOR, LIBAVUTIL_VERSION_MINOR, LIBAVUTIL_VERSION_MICRO, 0 -FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL { diff --git a/libpostproc/postprocres.rc b/libpostproc/postprocres.rc index e6104ac88b..5e6c1a6ed7 100644 --- a/libpostproc/postprocres.rc +++ b/libpostproc/postprocres.rc @@ -29,7 +29,6 @@ 1 VERSIONINFO FILEVERSION LIBPOSTPROC_VERSION_MAJOR, LIBPOSTPROC_VERSION_MINOR, LIBPOSTPROC_VERSION_MICRO, 0 PRODUCTVERSION LIBPOSTPROC_VERSION_MAJOR, LIBPOSTPROC_VERSION_MINOR, LIBPOSTPROC_VERSION_MICRO, 0 -FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL { diff --git a/libswresample/swresampleres.rc b/libswresample/swresampleres.rc index 1320f78b9a..f849c70276 100644 --- a/libswresample/swresampleres.rc +++ b/libswresample/swresampleres.rc @@ -29,7 +29,6 @@ 1 VERSIONINFO FILEVERSION LIBSWRESAMPLE_VERSION_MAJOR, LIBSWRESAMPLE_VERSION_MINOR, LIBSWRESAMPLE_VERSION_MICRO, 0 PRODUCTVERSION LIBSWRESAMPLE_VERSION_MAJOR, LIBSWRESAMPLE_VERSION_MINOR, LIBSWRESAMPLE_VERSION_MICRO, 0 -FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL { diff --git a/libswscale/swscaleres.rc b/libswscale/swscaleres.rc index 5cb8ee7023..ed8dd676b6 100644 --- a/libswscale/swscaleres.rc +++ b/libswscale/swscaleres.rc @@ -29,7 +29,6 @@ 1 VERSIONINFO FILEVERSION LIBSWSCALE_VERSION_MAJOR, LIBSWSCALE_VERSION_MINOR, LIBSWSCALE_VERSION_MICRO, 0 PRODUCTVERSION LIBSWSCALE_VERSION_MAJOR, LIBSWSCALE_VERSION_MINOR, LIBSWSCALE_VERSION_MICRO, 0 -FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL { diff --git a/tools/gen-rc b/tools/gen-rc index a28b013aae..37fc57eae7 100755 --- a/tools/gen-rc +++ b/tools/gen-rc @@ -93,7 +93,6 @@ cat < $output 1 VERSIONINFO FILEVERSION ${version}_MAJOR, ${version}_MINOR, ${version}_MICRO, 0 PRODUCTVERSION ${version}_MAJOR, ${version}_MINOR, ${version}_MICRO, 0 -FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL {