From patchwork Fri Dec 8 07:46:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mateusz X-Patchwork-Id: 6599 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp230934jah; Thu, 7 Dec 2017 23:47:13 -0800 (PST) X-Google-Smtp-Source: AGs4zMZOsfxESgg3E0Wf17/tS4TvqoJNN82E7yosTHVpFDSQQCO6cgZ00TJNFAx3ofQr/Powu6aE X-Received: by 10.28.157.7 with SMTP id g7mr2869305wme.99.1512719233625; Thu, 07 Dec 2017 23:47:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512719233; cv=none; d=google.com; s=arc-20160816; b=y16+vQyZe1xoMxuPuhTbN2Q5PC83HGaBurHQXZVdAXrD/WrMC6SvBvIOofxjeHppac Rd4E+HC08OgeDq+Cfij6g3RweaDIn7eSg87UFI6OzAgxvjFv3ODfoF0Ri92XqcQkur85 zh/qf4cTevlMoVg94imslD0adgf/4HT3p2fGxsAkWYjGJLXrdBpwmqN/DDEydEi4WXn0 0h8Hz4qyJc6BanKeuzjeXQfX7iKg+sDHkZao4PHBdIwYR1qys2Eu/WRdZANqiv0E2+KE /Dn6IyV3No2xtkf1iszMW8+TcA596cCFS75iwt3S7R3B6zyF1JrVBqo/aHIcm3M8bPLG 8W5g== 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=xckcTDuBnLcjFA9zdkqpgaBivLeTGSK3rdIdkkq8vP8=; b=Zubszq5JVfwtS4d2fP/NEjZY96HFCrYdjjZ15Q6OO34X+fS/CpOFQwjcGn08FKnosy CjeQ8Gd6KxF1jIf1Upns6neLI5cvM80Gm59sJ1g2e/y1YS6uijYZRu+XNaj4kqrypajw 9TajV3ZSAUX5ePIVCDxf/GVmrZWxG4F29LlE0U3qWoIQIp2os2emcc5CZV/UGbxexuFG pQ3q0gyGiyoNlJqCV4ckiC9BoEEUkzo2LuHWIhMIITwnnjxzlI/s+6NqrFDASzgWKiu1 ky4jAP2CvA4dnML9t2lETXbn16h/yIU5OoT1L0RAnnnPRuBMa4xjpXDkc85Eqbju9iqa TsxQ== 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=BtdRBg1J; 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 o6si5503951wrh.425.2017.12.07.23.47.12; Thu, 07 Dec 2017 23:47:13 -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=BtdRBg1J; 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 4B55E68A47A; Fri, 8 Dec 2017 09:47:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpo101.poczta.onet.pl (smtpo101.poczta.onet.pl [213.180.149.154]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9FDB568A202 for ; Fri, 8 Dec 2017 09:46:59 +0200 (EET) Received: from localhost.localdomain (afgl164.neoplus.adsl.tpnet.pl [95.49.167.164]) (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 3ytPZ95S1RzlksNM; Fri, 8 Dec 2017 08:46:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poczta.onet.pl; s=2011; t=1512719218; bh=w2SfEtyr9+5l16ENOmuphc47WaIAitVq1XLyB4EaFrs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BtdRBg1Jf/d0n/NggoE2C7l1HA011nvzc0tHRuQZGx1No1PEaGrJMKriBPkJBQMyg +CwsTdnjcxyRa3nGp4N2V9qDEbOZ4C9rtcKN8az80Jnc8M0X4K95tUneOQv8Phs2B8 xoMTeTidW10jgWnOMrJ1KjukqiW4fTMCTj+jxz8I= From: Mateusz To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Dec 2017 08:46:52 +0100 Message-Id: <20171208074652.2608-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 | 2 ++ libavcodec/mjpegdec.h | 2 ++ libavcodec/mss2.c | 6 +++--- libavformat/mxfenc.c | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libavcodec/jpegls.h b/libavcodec/jpegls.h index c8997c7861..6b89b2afa3 100644 --- a/libavcodec/jpegls.h +++ b/libavcodec/jpegls.h @@ -32,6 +32,8 @@ #include "avcodec.h" #include "internal.h" +#undef near /* This file uses struct member 'near' which in windows.h is defined as empty. */ + typedef struct JpeglsContext { AVCodecContext *avctx; } JpeglsContext; diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h index c84a40aa6e..c36fba5f22 100644 --- a/libavcodec/mjpegdec.h +++ b/libavcodec/mjpegdec.h @@ -39,6 +39,8 @@ #include "hpeldsp.h" #include "idctdsp.h" +#undef near /* This file uses struct member 'near' which in windows.h is defined as empty. */ + #define MAX_COMPONENTS 4 typedef struct MJpegDecodeContext { 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;