From patchwork Sat Dec 2 20:50:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mateusz X-Patchwork-Id: 6514 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp2703198jah; Sat, 2 Dec 2017 12:50:45 -0800 (PST) X-Google-Smtp-Source: AGs4zMYcLt8OSp+kemwgmq4h5+YquaosL0Sk41n9AIuQUaZvH6dfFYxIj0h2ensWB7qxMf+mX2zq X-Received: by 10.28.128.73 with SMTP id b70mr3867726wmd.53.1512247845770; Sat, 02 Dec 2017 12:50:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512247845; cv=none; d=google.com; s=arc-20160816; b=SfMWSJAxU6tLylmJDh7pIgLqgp5BJqC4WNrbyE/DMkKzyIXy3jkDvAknCD+5ddU9yb PYRdV4ATn+GXt+JYRHhDnraTpnaKGDrKHeFOR3mxW4ayZL84nj7USRLZEp0x+JjoJVrQ AE1W5sDb6XbzAttbK8lhavcH4JGGNQYc23xHOAZNmJXUQceT6u9OLEkgb+sq0yi0o24W jyxOGTXh0tj/KP8cPF/N3CR/PZAUAzuG/9lG2Gv1VTfQjg/6YsIf5Esy2ab8V2CWSi82 8VVjK99NHO1aYsd4VXIzPr6ZNumAEQLgiU+NC5huAheNjyqwpm0XCZbnuFfEi3Ee3RKj +3zg== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=t6Z2oinlpctzEwSowMgOfvYGJhzZEoMoNMy4lHU9dUg=; b=rtRnAIdmUs6vl+Ol5ZlHPylDw2Q1/kwv7DHM0fdqe4Z1Ti11dET9aXo9hWyJIZE9hh 8b0ynGDCZX4Ia/5Zbxo71sKI/FaNjNUX2WCA9oPVulDGn81PigWmPgan9ph4faF54Q+U yLScnQw2xfW90kOKoUWN88O2OCmKxpTDpBiE53Kh/vL+RZqi94Vn0Ea+K0rxjLZss/4z m+nAOREJ8sQX74zmvWXALzpLv2uu9EQa++IBgzZAhRtTRcKH/o9LRNzY5wPSTm6TTzH9 ZZWXBI6Zo+XRwZXPlhF+qUW39ST1SjjEXNUV/iCwLjXtescs4H6F2NrHJIJlkn5dqVFZ /fTw== 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=d6Vm+xKv; 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 140si2640398wmv.53.2017.12.02.12.50.44; Sat, 02 Dec 2017 12:50:45 -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=d6Vm+xKv; 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 10B7368A345; Sat, 2 Dec 2017 22:50:39 +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 09E8768A041 for ; Sat, 2 Dec 2017 22:50:32 +0200 (EET) Received: from localhost.localdomain (adsx10.neoplus.adsl.tpnet.pl [79.185.209.10]) (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 3yq3F56Z13zlj1TH; Sat, 2 Dec 2017 21:50:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poczta.onet.pl; s=2011; t=1512247834; bh=YJ5ee/pfm6kMmEvrI4/8aOvO9VbT6/2RiqCyIVvrwFc=; h=From:To:Cc:Subject:Date:From; b=d6Vm+xKvs02zKbEorGIY+/jHa/a30hxGS1ObB9GAvlcF87zdQOTn2BSHZJXhtx6c3 nMRWHpMqERheZO3J0tu1zZSsMMNN+jAoi4pGSmU4+Xtp+SIb5K99GiwU0qjdrG1rql FM2soQ0jRWDWU4i/MNy6a1u9g6OsMKRSkkLsTh4s= From: Mateusz To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Dec 2017 21:50:26 +0100 Message-Id: <20171202205026.8516-1-mateuszb@poczta.onet.pl> X-Mailer: git-send-email 2.15.1.windows.2 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..f850349a0a 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 { +typedef struct ff_Rectangle { int coded, x, y, w, h; -} Rectangle; +} ff_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; + ff_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;