From patchwork Mon Dec 4 08:03:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mateusz X-Patchwork-Id: 6539 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp4099420jah; Mon, 4 Dec 2017 00:03:31 -0800 (PST) X-Google-Smtp-Source: AGs4zMY5LVn27ToS0uBN1nmBhhFYbOwFuRdYRJEyLJgYn+A0F7NVHUSrsZ3SGimvbQ/1lPoNK6zu X-Received: by 10.223.158.203 with SMTP id b11mr704050wrf.82.1512374611238; Mon, 04 Dec 2017 00:03:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512374611; cv=none; d=google.com; s=arc-20160816; b=gJ8Bi5RsChCnvJnAoGpAyEHiEEbDOI2Fum2C7udq0u7z5/DtBUvjEZRxL3iMGwUSgu wongDrQLZGeHugfzFCn7x4Pq3eoKFQeNQIlwRQKKRH2triLZBYuQpY7FJe1i67jgFSic z6QXDiIfJORtlgtYjZa6k7rgwB35uijGmYn/0VUXjYTyk584KbRzGG0EdCMTuMcAFjxU apQOhy6IwF+ByPnqPGwYe+1Gv8K5Bv0WJZbbUnlh01qMrwdvqQTwhyPQgssckJSXn1LI dGslY7Uh3c+8fjZDPnP3THO21V4VEFI3dJuVf+2i96cLEPtI2NmmvVnv3uZ7XDgDvigL Ll5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=Cf7Z+DKkEXEZYedoO0f4ekvh7835XfdYHdR7tUNjDUA=; b=LRVHqFGf0ATSL/K0YlmKq6t67F7kMSo3kPIXVM43QzJi4CQKWVfgj8+acU8XSg+BWO J8OKhqJ55PDdMA5O2T2S5sTytvVY1YD7J3yEsnmNRu3yT09qxamPM+Cx9eiVNF4knuGW 0bqmvZJuTPNnyCX9y+yBF06ySl3BM08O0r7FB6CPIKOaE1LGpgmewQlGGWUCJZLpzBmE Y00WDbYf4sZLwyluJUPndrzY0rbYHbmM1SLRuk266oZ6Dub8tjtt3zd+wo2MqFLTGZVV B5bxA/RgEUh4aL9thHJgYLhav4vTpdaFyvd/ZfQk+vn6jvPXp65nNGDXNu4xUUWDl7lK 7Bew== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@poczta.onet.pl header.s=2011 header.b=OOTCl3Za; 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 n16si10073078wrg.528.2017.12.04.00.03.30; Mon, 04 Dec 2017 00:03:31 -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=@poczta.onet.pl header.s=2011 header.b=OOTCl3Za; 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 7C57A68A2C7; Mon, 4 Dec 2017 10:03:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpo115.poczta.onet.pl (smtpo115.poczta.onet.pl [213.180.149.168]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3FB8968A181 for ; Mon, 4 Dec 2017 10:03:18 +0200 (EET) Received: from localhost.localdomain (aent158.neoplus.adsl.tpnet.pl [79.191.97.158]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mateuszb@poczta.onet.pl) by smtp.poczta.onet.pl (Onet) with ESMTPSA id 3yqy6t1vd7zlk7Yr; Mon, 4 Dec 2017 09:03:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poczta.onet.pl; s=2011; t=1512374599; bh=sq5y2SJjbf0m/CNHJsudt4eGyD5y7umXsQ4cVPEuL64=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OOTCl3Zakct34eqm0pEnHrGUESXEtgJoKRwoQW5UW9nOgeXhrKrLljFxWl6dCqojo hB/k6OtHyERBjm0g8xIthoEvm1W9GZdUh/vjZYH/TA4lD4ii9aR99D+w4XPY6YnhLV 5+McG1SvzYrjuznZG72iTKNBnLKEODns0378oZxs= From: Mateusz To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Dec 2017 09:03:10 +0100 Message-Id: <20171204080310.6484-1-mateuszb@poczta.onet.pl> X-Mailer: git-send-email 2.15.1.windows.2 In-Reply-To: <20171202205026.8516-1-mateuszb@poczta.onet.pl> References: <20171202205026.8516-1-mateuszb@poczta.onet.pl> Subject: [FFmpeg-devel] [PATCH] fix MSVC compilation errors 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 Cc: Mateusz Brzostek MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" After commit 3701d49 'error_resilience: remove avpriv_atomic usage' we have included windows.h in much more files and we should avoid conflicts with defines/function declarations. Signed-off-by: Mateusz Brzostek --- libavcodec/jpegls.h | 4 ++++ libavcodec/mss2.c | 6 +++--- libavformat/mxfenc.c | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libavcodec/jpegls.h b/libavcodec/jpegls.h index c8997c7861..69a57b9538 100644 --- a/libavcodec/jpegls.h +++ b/libavcodec/jpegls.h @@ -32,6 +32,10 @@ #include "avcodec.h" #include "internal.h" +#ifdef near +#undef near +#endif + typedef struct JpeglsContext { AVCodecContext *avctx; } JpeglsContext; diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index 9e7cc466de..3180af1d60 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -464,9 +464,9 @@ static int decode_wmv9(AVCodecContext *avctx, const uint8_t *buf, int buf_size, return 0; } -typedef struct Rectangle { +struct Rectangle { int coded, x, y, w, h; -} Rectangle; +}; #define MAX_WMV9_RECTANGLES 20 #define ARITH2_PADDING 2 @@ -485,7 +485,7 @@ static int mss2_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, int keyframe, has_wmv9, has_mv, is_rle, is_555, ret; - Rectangle wmv9rects[MAX_WMV9_RECTANGLES], *r; + struct Rectangle wmv9rects[MAX_WMV9_RECTANGLES], *r; int used_rects = 0, i, implicit_rect = 0, av_uninit(wmv9_mask); if ((ret = init_get_bits8(&gb, buf, buf_size)) < 0) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index ed6ecbf541..407acdcaaa 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -1444,7 +1444,7 @@ static int mxf_write_header_metadata_sets(AVFormatContext *s) AVStream *st = NULL; int i; - MXFPackage packages[2] = {}; + MXFPackage packages[2] = {{NULL}}; int package_count = 2; packages[0].type = MaterialPackage; packages[1].type = SourcePackage;