From patchwork Wed Jul 12 10:05:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Oliver X-Patchwork-Id: 4307 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp599861vsb; Wed, 12 Jul 2017 03:11:10 -0700 (PDT) X-Received: by 10.28.11.134 with SMTP id 128mr2021394wml.79.1499854270146; Wed, 12 Jul 2017 03:11:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499854270; cv=none; d=google.com; s=arc-20160816; b=c/8fJJggv9OUn3XZ+uGP6jWwJ66Xw8Ik1O8uiJTLRR7dvneiu5G4NksKYG1kuD+nWw 2APd3mm96akl8rOSQUcDLKX8KvQcQbqCNd5Ja5k2SnBdUCZNEW6OWTrHnZega+hQUgcO BD3zyxKPaZ8aZeyKjCZx54chFi+R3Ih+gWehGVUeUL/cC+rMzSbvFDaPYMQIu1/a+8N+ FaLOy3rnkuBUhKeCGZ+HFPvpLgzjYxhegtf30pfWgWnOuZynEckc/hxh1I/cZrN4yRo2 t6Rd4E23IW7sde2X9Bo4cQxVVD9u/MvouMHvm7pzpJl4yNVm09rspj3EYpucM4rl3H0z 3lbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=D/XzeDoeuJPE0u7bh1bbNHtrlfxraMt93W2GPeJg4v8=; b=E4hvAwDu09GI8pnJ8RDLcwXakvIcev0xR24gOPcNgyCUXmkFhc7dEOP/32eV0SHvDj dwwJ8m7O6oqDqmaRjDbWUB8/vhZrO2/WG6OmnvqmGZBjARnMS7ilIVUGSj0TRlNqGWD7 vl0n/dNGBBI9mKlVmpdINW4VKJmn09e/JttN7aMvA+H6UhnPvEQYIV4+ZGsRLm5U9eUm PhB+vVnRG6itq2FSC/7KkQOuGSM7pcvUggLZRF7xGCeW+0vum7blKRUN4WHpCzd0+F/n S/k1fWe/unsAQWJOrajlPGaTW2VA9qLaRvdX9BY6gAzDfHxdjRaSEJRJbPMuly7xkp+X VToQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=Mx8X0kR6; 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=NONE 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 n37si1499526wrn.239.2017.07.12.03.11.09; Wed, 12 Jul 2017 03:11:10 -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.b=Mx8X0kR6; 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=NONE 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 5B062689B9D; Wed, 12 Jul 2017 13:11:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2426E6882FB for ; Wed, 12 Jul 2017 13:10:56 +0300 (EEST) Received: by mail-qk0-f193.google.com with SMTP id q66so2512377qki.1 for ; Wed, 12 Jul 2017 03:11:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=s+N4rEAEqaEZP06mCsXgp3my++ahDLoK01YrqBVOgAE=; b=Mx8X0kR6dXNrzhNQkmGAgkocnmKifZInauy0lJCC1yD/Klbhl+s8cBgZdZJD94k/ca u3uhmSOCLOQakg0KyIN/5yeK8G5QDR13qcKv+EDObjGRaoC49Lq/UlzO2C7GETpkk3b5 4lg5uZa1RYwwAk9BwIm2ygs5COYXPPv8AmlEYCoHqk5R5RN+RzWadO7Iid7LoQIuqlAK fl0ptjL6U8tZutk52mWoXAJviBDZfm9ymv0K1SNlKyNc+EanOG4fcpTNWq4k4jvslPTk 70Vpm3l8Wrex7ovVhSeB5LQk6axngWs2u7C3rNuYY/yw5jc/aauBZrCzwAOke8bnDFEO I/Vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=s+N4rEAEqaEZP06mCsXgp3my++ahDLoK01YrqBVOgAE=; b=fskASJucOyzMv74X5CD0IRwiakMhF+6uET0sH7eeLj+VfAZpFtElqDDl+8Wm6nrG1T ac0q3wwQRfazD4nnkoULuIHTN3jch1dooyccjRJeNKCDcznRY6BMayojJAe63htHjGAg M/ehoKyqd7ruQWTfMEP+61Bwpt8r7aDJhx+9SXYbp9twfa/UE3XyQICoNvcw1IGInsrU iSfuNTXYUg/jxclWou6bUagTMkclrVzaUIQxutVz/IS7dGBd4cbwI59FUi6Wz1mLVYdV ymFLXe/Uu537DPpSeFpcvFENzV3MpAutg0W+GhI+SSPwnsbg9GVQ7g6KstJ79Y7yXGh4 R8hw== X-Gm-Message-State: AIVw112ICDW/XUtP0Uf9JBdIkoSLHHNxHniixZ+KMzPFas+MKwE3UJM7 WTuXml+UkmMtP6DOzAY9mwiYM8QV8wGpoUc= X-Received: by 10.200.45.182 with SMTP id p51mr5596767qta.208.1499853909182; Wed, 12 Jul 2017 03:05:09 -0700 (PDT) MIME-Version: 1.0 Received: by 10.140.40.41 with HTTP; Wed, 12 Jul 2017 03:05:08 -0700 (PDT) From: Matt Oliver Date: Wed, 12 Jul 2017 20:05:08 +1000 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH] lavf/os_support: Use existing WinRT config value. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" --- libavformat/os_support.h | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) { \ @@ -232,7 +220,7 @@ static inline int win32_rename(const char *src_utf8, const char *dest_utf8) fallback: /* filename may be be in CP_ACP */ -#ifdef USE_MOVEFILEEXA +#if !HAVE_WINRT ret = MoveFileExA(src_utf8, dest_utf8, MOVEFILE_REPLACE_EXISTING); if (ret) errno = EPERM; diff --git a/libavformat/os_support.h b/libavformat/os_support.h index 6e245a88d8..91220e9716 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -146,18 +146,6 @@ int ff_poll(struct pollfd *fds, nfds_t numfds, int timeout); #include #include "libavutil/wchar_filename.h" -#ifdef WINAPI_FAMILY -#include -// If a WINAPI_FAMILY is defined, check that the desktop API subset -// is enabled -#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) -#define USE_MOVEFILEEXA -#endif -#else -// If no WINAPI_FAMILY is defined, assume the full API subset -#define USE_MOVEFILEEXA -#endif - #define DEF_FS_FUNCTION(name, wfunc, afunc) \ static inline int win32_##name(const char *filename_utf8) \