From patchwork Wed May 16 00:25:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Bennett X-Patchwork-Id: 8986 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp2131308jad; Tue, 15 May 2018 17:31:46 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqG9mv16DithaIL/3wdqERsB/WpZoSAFqzu3xz57f593/gD66BgYnPkKs1B2CRGBiPOg2gx X-Received: by 2002:adf:ce8b:: with SMTP id r11-v6mr11222331wrn.242.1526430706104; Tue, 15 May 2018 17:31:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526430706; cv=none; d=google.com; s=arc-20160816; b=aQBdhf2G+8ISb2ZEnG+EMPuA/WxT5jjG7LO2ImLbZfiIMupypbfyqPOByvxgbXxcMp bBJE8zzN71TDpf6qNhyyVPgOpjhWyJH80LLnWbCDEd6TPEvjiYaZCrAlDnhqKtB8sdkT RUEsXNLqLKOzxUrGet/mY/luYb5C7BOuyYo+5scZ48kUzacto9qHRP2JY9+nAOyp/tcg yULC44pmQdi5h5EgNi8r70/EqsMDzUnPWGExsQkPNlZ2wUjw88XvUPMoT+/RsWxOhzYZ fgV211HXLzBzryhCVuT6P0X60/EJDJ8D7/f364Qu15BQCGAYqGdpP5w586cLh8u2RJKe Rwsw== 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=u88AkhGR4sfR56LqW7GPgCyxhFgawbARR9QilLM7oyc=; b=QQw2Pjxp0OGw7Q85n9T6X8Odr0dW/bMsMlkac72qNz6IbL1Y6IhEYZY7A+tCR8fRYl Ct8pxGRxlT//yntzfqcI9VHKJwzJLg/5pio6qla3gie+xRaQUuZ5hawWvrY6otXEYdb0 k8cDCcpR+ihBIRKFuKgfR4N3iGxHNvdosgXrgzI136cpkq1GZLDEPGRMD7e0PbsZ/yO0 r0rIseJAkG/eVt4XDse2C1Qp2zN4AWRekIVKUclla38+qouCeYoaeOqWDR//C/8ZayPZ V3ol//7SNx+pZmS6WsIkZmfVDGN5dLimdOn958nMt4jTC2fE1G9+6Wb8WnmgQLnmtxxv f0ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Y/Rl4dnU; 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=QUARANTINE 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 t126-v6si1095649wmg.43.2018.05.15.17.31.45; Tue, 15 May 2018 17:31:46 -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.s=20161025 header.b=Y/Rl4dnU; 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=QUARANTINE 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 439A9687991; Wed, 16 May 2018 03:31:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f172.google.com (mail-qt0-f172.google.com [209.85.216.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B1EF268041E for ; Wed, 16 May 2018 03:30:59 +0300 (EEST) Received: by mail-qt0-f172.google.com with SMTP id d3-v6so2837562qtp.11 for ; Tue, 15 May 2018 17:31:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=bLd2Jpb4HYIJQ13MxG+RUImilNcf5xYHO3Yl+H12Cvo=; b=Y/Rl4dnU48hIgty/hGQ9B4XWrw7FgdGZOcT7vQp+/dOodt0tbDD7aMG2qZwQIjy1DP cFSPWIDhUy0r6g8npqRikK2NPTqGW0xAy2lhmL2rQnEHnC1syz0xqjc3jZPBeR3QHXtC OOwnzbYd+1F/3Wl3iEoW42+8Rv/a1PgzUMVdkievYJ7s9mwjhQ/OzO0A7ZMyjSiGPghF YtttuPtgrrQIihwGfb99MvD5aybBflilIqLqqk8auVChhfCAlafwlJah8KubP8w8Y7wW 4Nt6P6FggWnShU2s22S/Yj6F5ESdY5SQw9SK8xYEOXSgcxJRtvQJu8YHCIExaNAsbEpZ ZdCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=bLd2Jpb4HYIJQ13MxG+RUImilNcf5xYHO3Yl+H12Cvo=; b=aVtUxJKC4JiKkx7ikQwKK9O2rYc4EXMWEv9Bs5fpfEFWIVUuYKb/n2O/k/Fys+03X8 Vh4i/wIQTMXeSntfj7QNBr12zLOzw8R46kAavnT/2KlbItJX8aLJqx7g6HkNj62i62+i 0P/4jIyak7R6HscR4ikxRXZpe83g84JFm731uSSlgI8IHCiL+MDymuSRCbw0eu8plTsx ntnjQTx00byUbTS3LXapvvXkJtoQ/HrXs+7uRft0GUxXrsKqzioSNqGMwJ/W3hyfhvNm c6ciLi+hCdsM5C74Exeqdoc9UEfsJBqTB3BpvIyNlFdNpm3d3YHyHL0ljQ6K28EyLGZW diog== X-Gm-Message-State: ALKqPwcTgcSLGTN0wT4ZTA55HdWSlFbO9DsLx+RHXgjEHdnLVS5U2jbQ 1MCpuloY6llJnqfVY87LrftjEQ== X-Received: by 2002:aed:3245:: with SMTP id y63-v6mr15631294qtd.7.1526430367162; Tue, 15 May 2018 17:26:07 -0700 (PDT) Received: from localhost.localdomain ([2601:183:100:3a80:5d31:c2c2:b51:3cff]) by smtp.gmail.com with ESMTPSA id i45-v6sm1066981qta.12.2018.05.15.17.26.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 15 May 2018 17:26:06 -0700 (PDT) From: Peter Bennett To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 May 2018 20:25:57 -0400 Message-Id: <1526430357-24806-1-git-send-email-pb.mythtv@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH] avformat/error_resilience: Allow file to be included in c++ programs 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: Peter Bennett MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Peter Bennett The header stdatomic.h causes compile errors in a c++ compiler, even when extern "C" is used around it. The appropriate c++ include is . We cannot use #include inside error_resilience.h because that causes compile errors inside extern "C". With this change, using error_resilience.h in a c++ program works but requires also including in the c++ code. --- libavcodec/error_resilience.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/error_resilience.h b/libavcodec/error_resilience.h index 664a765..7d81c4d 100644 --- a/libavcodec/error_resilience.h +++ b/libavcodec/error_resilience.h @@ -20,7 +20,9 @@ #define AVCODEC_ERROR_RESILIENCE_H #include +#ifndef __cplusplus #include +#endif #include "avcodec.h" #include "me_cmp.h"