From patchwork Wed Apr 5 14:50:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40998 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp445948pzb; Wed, 5 Apr 2023 07:50:37 -0700 (PDT) X-Google-Smtp-Source: AKy350b6/9CCpkLNpBfW8rIKJaB2jQpkU23S5zmVbS3tyWk4RjDB0FzcrKxOtlb5N7k4F8t0LWxu X-Received: by 2002:a17:906:af11:b0:923:812c:a5d3 with SMTP id lx17-20020a170906af1100b00923812ca5d3mr2514401ejb.25.1680706237163; Wed, 05 Apr 2023 07:50:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680706237; cv=none; d=google.com; s=arc-20160816; b=VSAOl4d3CwXNE98Cv6ZprIUZ6NDJkjDI8BVu1zh3u+8LUy/3TxE5OlfrQuT5UB5oez sbIHLVzRXufLgMOFMQKYm3ZTtjbMHd9qlJWDPsqfbm1HL7scm9+YteHNpewd5Rzi1b3O Pj37BVL4oVhsP0ZTOPBphNtVMVb/zXtFQMRajr1ylZVJklzAEKKh31YMbe8UY4oVm1Z7 58ETp4XQhDlC1itBBRkgzvqkjvXpW07FeXqLqg9yCyWaX81aM6mL8Lw4K/R5wb3cvd9r mpxSbkKJCwOqLzyfvh6tGtgyTWKE2CwiIz/6QDW+jazbs5CHiM6AY/wwl6tYcczgOMAU gO8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:from:message-id :dkim-signature:delivered-to; bh=cMehNtgyZTUZGYTD7Gya14D9OwPxRL+chPCoWbRtIEo=; b=ucU5cqJkAQvwSc0LDzsziUbMGfG+dadi0vneJgBGZXYVDDcLs34UZdYjtkayTlagzD pmnbnddXUHkyRtWg1sbO/vS5LSSo61lPb19OILF42UUG6SC4Lm57hFgtr8M1nJUsbZVt fWjEoTKZ5lSK5RNAhn6cylpkjHNASxvN0QJCddLcFTz/QZaRepnkevIvRmHcf9TZGi+A ojB+3QFoZBOxYdFodcHHesT1HZKbXpLJc9iPye+UdTDGFlXgM7Rk9S1GNhnsW96430E+ JAkusNDvxMAIUtPgTyx/qLAXhBkjuO91vZ26xIIl6Cjeigrc9WGMgJo66hzd2UWfdW5/ T8UQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=oWkyjml5; 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=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t26-20020a1709066bda00b008d6b51de6bcsi4772444ejs.32.2023.04.05.07.50.36; Wed, 05 Apr 2023 07:50:37 -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=@foxmail.com header.s=s201512 header.b=oWkyjml5; 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=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2569968B947; Wed, 5 Apr 2023 17:50:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-72.mail.qq.com (out203-205-251-72.mail.qq.com [203.205.251.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2BFA68B7D1 for ; Wed, 5 Apr 2023 17:50:24 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1680706214; bh=7B5DTLfOGz6rZ/xmS/JKkJLOxOo3IAVSjE4uG7fASPg=; h=From:To:Cc:Subject:Date; b=oWkyjml5spyBQ1nh5KuuoO3fAKUeokw6/xDpSjeIA2L7VLppQdAnJL1/8bnW8hJnl 0qclUr1POruMfp3eEqWrbLI+Tlol/vcFKSN1jdhbXxfSYOgJXJ7Z8Jb+9GADV66LfE 7orNkMoWuEQCHDFSEyxCf5Kh8QBLlREC+Xe3xZu8= Received: from localhost.localdomain ([113.118.114.37]) by newxmesmtplogicsvrszc2-0.qq.com (NewEsmtp) with SMTP id C8D9D6BE; Wed, 05 Apr 2023 22:50:13 +0800 X-QQ-mid: xmsmtpt1680706213tf2hboy5o Message-ID: X-QQ-XMAILINFO: N5sfBKY/oC4k9zZ9mc/VN5TPhXVijJEwoWJh8ZNG4arg4bRCE7t4akUn+A1HCs tQoTXBfFjmeaMOZDylMb7bZ2k6pLOVCyOUUS2kWCgnaAYB3hfyQXc0GM4VFRqvGdXykJFBcxOpXV PZ5yBl6fWl3FvrO9f8q18BbXbwCUFIqbkb/gVdC3c8fGX3zLlCwaaSvcDMqXLeMNoPmWryvAIphj CRUZY/+0o6O2d6pohbJhY3JUTLnIzoUpQeKZDI/+CXbb51we/wWOuP0uWdqxSPimfBeHW4P3FRNo hGqbzTntKkjp7YTXLVD4dXRpGoSFTPJ6V6ZxXfapNVBChLwIqo24RB+ZSp2ar8XuZmRBMFryV704 WY57YoSPBXBynuz9mpCueVnZbzd7g2slYIChIQewV86Ys5/XvuWXDnVzTOYv/JCz0Sr+viwTZonC 4FaGHNhKYsUeBquDn7FzKD/uvjKEUdltNz7jyw/5PM4uclrzZSZqcwPUi8sci7MsGQg9GyueFd4/ c/zk3vVKToHVCwoK9pYOBVDGRKleLg+SXn3NrVms6coKxjAUnBB3LiLyCbk/HKJFUcKOGmsdKNNc ODXhGk5j45l2ArysNgvPcYfNh8M0I0v89pHS5krCZSIWXJCdjW//aQyOt2Hyx9xtt6qDMtyEiV1A p0fqNRuMmzdxcxHTnw3nkiSZxZaX3ZlB63fC4BprrgL1W8dMsFxOY2MXoMre56qqrNYcehEtXOKk arQPb79J5JETeC8RTeNeL7Z0oCfPNF0zseh58pXzQwzXqU8Tbkhm0mQPj/Kin4wHdpiDN7C5qDF0 e67JYKSxbKsGPvKpZWIk8odvFRQOpOfUcBNjhSH9RE1XfDfywhqBMPvD5lQ2GIRePgeVm4zyIgW+ gqHIdNle5ttFlsEtzxXTZjqoCWntDzPhTFkvO+DYlKOBhRvJc0hHw71X9xu6/ezF8mBpMlPBgig9 skta099mGrqZylvcTpW+xPSUrdcq50LpDngImgEJNQJu/bO24kGw== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Apr 2023 22:50:08 +0800 X-OQ-MSGID: <20230405145008.461544-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avutil/internal: remove timer.h again X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8+G7xegLW4pd From: Zhao Zhili timer.h has been removed from internal.h, and then added back with 3e6088f for convenience. This patch removed it again for the following reasons: 1. Only includes what's necessary is a common and safe strategy. 2. It fixed some build errors on Android: a. libavutil/timer.h includes sys/ioctl.h, and ioctl.h includes termios.h on Android. b. termios.h reserves names prefixed with ‘c_’, ‘V’, ‘I’, ‘O’, and ‘TC’; and names prefixed with ‘B’ followed by a digit. c. libavcodec uses B0 B1 and so on as variable names a lot. So the code failed to build with --enable-linux-perf, or --target-os=Linux. --- libavutil/internal.h | 1 - 1 file changed, 1 deletion(-) diff --git a/libavutil/internal.h b/libavutil/internal.h index 454c59aa50..001103142b 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -40,7 +40,6 @@ #include #include "config.h" #include "attributes.h" -#include "timer.h" #include "macros.h" #include "pixfmt.h"