From patchwork Tue Sep 26 01:52:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 5279 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp3284444jaa; Mon, 25 Sep 2017 18:59:40 -0700 (PDT) X-Received: by 10.223.184.161 with SMTP id i30mr7748490wrf.147.1506391180859; Mon, 25 Sep 2017 18:59:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506391180; cv=none; d=google.com; s=arc-20160816; b=d0XTzORFEJxPZQbiAUoU/B+wkWuQlAsrcpXxPhTaPSrgzZnLq3nwGxCbfX03fMQqBQ KIcZLzhMrCzTj8a4QACJoyhfKC2y6RlYvGMUToGg9YxFr/BNNhnmqWzP8Vd4Wb96R3WL k2dO/nLPCaTGlKbwMJIVrvZPWLql6gxxBnagnHo/PVYq3vXB0iP38+fIEZlEnVrM0bjr eY4R/O4YIDRaPtV9fZa2xOHgz43IfvJwMCIs94nHmOo5FLsVKU+whlci6rtD2LbLIAjP mN6xvgzHx+DpNXHOijZFLwdhaLTlZAVkJplaxIyMVKAH5n/1qG3Xd5kKcgsiCOWELc67 RG8Q== 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: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=NGYNyQQ9tSdxGeGeHt1WmrARCbV71CqVM6knPZIdYTM=; b=yYv//ClIhex8JBOfhG5m6Py2OpnHa6V7lGUPmAuqTK2IZOqGHjvxkU+lQ8/HxAHGUN UzCs9fW3kJ4V9eEVLF+894jiEXTnwk+8ZtkHzZHdbg7ZFGDv5fQ8ZYYy7CkTOziGc+ui 6FCt5P7bzuhM4UtexlF93Zs2YsBQGutW6C1vVuj38qKQYzGEv7psl7WRs/+9we6fnP5o NUw60GMQubAVxJ4v0imxlNpuklc8gspaBU/jD432g6cs2zz0utwPKMMxzslyMpigqG4K UfUyAUYhhS96tlmZQyLEFztqSjBkEg5nxdr2fYUszRjEOxScYXGdK01cwxVzyZjHgHz9 iTsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=AhoC4H4a; 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 18si646094wmj.84.2017.09.25.18.59.40; Mon, 25 Sep 2017 18:59:40 -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=AhoC4H4a; 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 4AA73689B40; Tue, 26 Sep 2017 04:59:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f194.google.com (mail-io0-f194.google.com [209.85.223.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 56977689B12 for ; Tue, 26 Sep 2017 04:59:18 +0300 (EEST) Received: by mail-io0-f194.google.com with SMTP id n69so3825483ioi.3 for ; Mon, 25 Sep 2017 18:59:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=RzWFIC4F2C2aH8rSu6SGIcUYNQh3DxvoRhWPnk23NJQ=; b=AhoC4H4aWTNqYjMh2pLc6vFWCQNu4ldd+5mpR/HCH9FpEMCOfofT+VGJN79x+hP4Lc 3Jbe/ZicamWsuexaxjgpoJ5zx34h88BQTea8WlfAysWbN7MwHTOFUJQlPps1W7CVdjXj VEpXMlpyNOrIZlGGA4hB0tjD+2lzxSRxygaOC0UbcF7cB4OdzVq1vv+5t8jT3l7Zk4hA gkurphsCt6nxcYNQJYRUo0DE6CmONwEJL6FhsI6v1Jc8kxzxkhDXIiBWsd1vlOoU2Wxu TtiFynv7COPf9yl0Y8z+wXYxK7el25/Yy3YjnrZDAuo0iYNpTU0kcuOWEAsC/4VnlW7s 8gRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=RzWFIC4F2C2aH8rSu6SGIcUYNQh3DxvoRhWPnk23NJQ=; b=PDjWIkqfuOWxkz7A2la09Hq3Pfu9Z8sj0Hicj9gIwOXR5+CHMzdEa67uK87v4rTdci mrq3gNK1HQ3C9qm80epKMQKFO9nlzqtNH95pdkOcRxOltnkqzVfvd0XhbjT5fKlaj/Yz RW1l7O7EPLQBXcJasUVfUtJezWbx146CWjrQ4RayCdpPxVB3T0BoYO0nx+1ppJTKWLxi /EscfQkcIUjcQ3pJsYCVY9aoz1Y0eIELRV0jsLPKmdoGtP5ygt4bKQZnUgZWFXZQJqzB DaekWTf1gWZm17t2J8+dT95bnDTLMx42u+SOO7t8ChCkJewe8v1M8OS4aozuVjMQtbLU PMJA== X-Gm-Message-State: AHPjjUgiXgYcbnDWbyeelygCyl1zzfXpfIbbo/FZTslVcI6ItKSvtSNn T5RT0QMI0BSFYfXVGrHtKF0AKsQY X-Google-Smtp-Source: AOwi7QD6LlAIANtF38ixFfeA+zxUBZUKH2D/mYNA1SskWlWQZ5PiWcUyynwA7X6BPQVvVJUytsejnQ== X-Received: by 10.107.186.86 with SMTP id k83mr11879555iof.173.1506390740058; Mon, 25 Sep 2017 18:52:20 -0700 (PDT) Received: from Rodgers-MacBook-Pro.local.net (c-73-75-100-12.hsd1.il.comcast.net. [73.75.100.12]) by smtp.gmail.com with ESMTPSA id e84sm445367itd.25.2017.09.25.18.52.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Sep 2017 18:52:19 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Sep 2017 20:52:17 -0500 Message-Id: <20170926015217.42597-1-rodger.combs@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [FFmpeg-devel] [PATCH] lavu/file: fix build on Android NDK with unified headers 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavdevice/fbdev_enc.c | 1 + libavformat/os_support.h | 6 ++++++ libavutil/file.c | 1 + 3 files changed, 8 insertions(+) diff --git a/libavdevice/fbdev_enc.c b/libavdevice/fbdev_enc.c index b4e5f84975..a9be608383 100644 --- a/libavdevice/fbdev_enc.c +++ b/libavdevice/fbdev_enc.c @@ -28,6 +28,7 @@ #include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavformat/avformat.h" +#include "libavformat/os_support.h" #include "fbdev_common.h" #include "avdevice.h" diff --git a/libavformat/os_support.h b/libavformat/os_support.h index 91220e9716..54324603c9 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -65,6 +65,12 @@ # undef lseek # endif # define lseek(f,p,w) lseek64((f), (p), (w)) +# if defined(__USE_FILE_OFFSET64) && __ANDROID_API__ < 21 && !defined(__LP64__) +# ifdef mmap +# undef mmap +# endif +void* mmap(void*, size_t, int, int, int, __kernel_off_t); +# endif #endif static inline int is_dos_path(const char *path) diff --git a/libavutil/file.c b/libavutil/file.c index 7bdf6cde84..c4b22539d0 100644 --- a/libavutil/file.c +++ b/libavutil/file.c @@ -21,6 +21,7 @@ #include "internal.h" #include "log.h" #include "mem.h" +#include "libavformat/os_support.h" #include #include #if HAVE_UNISTD_H