From patchwork Fri Feb 11 13:11:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schneider X-Patchwork-Id: 34231 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp3189402nkb; Fri, 11 Feb 2022 05:12:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJy+Xfi4QpaA+F9cCA86QtvcQ/Xn6C9D9T9i9nopL8OyqiIRtnHXP32Oek0uxfd2IOZBJtD0 X-Received: by 2002:a17:907:94d0:: with SMTP id dn16mr1397361ejc.199.1644585167224; Fri, 11 Feb 2022 05:12:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644585167; cv=none; d=google.com; s=arc-20160816; b=mp/o7nvP9vLqJmG18cJ3tlXT/MgnDfRrQcSuLO/OwPXQ4m9l4BqdKtw+IsDJuf4Lso /T6606xmPcwlJbZad6Evq2QNpPGq4gd+Ye/stTyXoi8kidvZt1YqfYgltm/aH7GZYGUi vcrA2r2hregjrtAOg2AxRL+HErxYTOfp3vArw+uOhd93XWKbgHrdws1bwEvfgsj0ZEpq zS/EjNjIDScT9Srvqb/9EVZe4cPDOhI64gR/dALA32C2Kl1o9Q2B2rZ44mTF8U3QcOpe mkTBxztDesbFBUvUHlW2X1u5yzWfjVp1L3AcpqX7zlWcJE2ho82Ubmq3eCwvSaYObrKL 4oag== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:dkim-signature:delivered-to; bh=aYVD5jUQ29dcXRJiN7mOW5kp6jCuQxiGvXuJ2LIQm+Y=; b=qvU4mZvDYaqQ+K/BZJdt3ngHouUwWWSucHEBNRD8VPlEQKND+dfG1TQLuUPt6B0sTR nfRvcN0pJvGrlqf9YtvjuJixYA3qHF3txOCs2hRGFoN16dS+4mYxbivGOTJHn/EVUHQS td7JBLj7d7GHWqFRccTVmwCp7jyxb0T4RfEeqYylcjNpk8tAfKZYzBJEhym7Gd2y4h/e NfmjW9jOJC31BWRCtL3WN68ZZmD2iBgMQu3/9zuXk0uMQkBOV9ajil4glY1PcPEQu9IQ MMpPQHlLxIjObW1DU4D+ocMZ/Qm2rb2QJiTkN+5uWFhGDty4NB/ufOZ0MxRBvr/Gfgxx XTsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@cryptomilk.org header.s=dkim header.b=D6hxLg9b; dkim=neutral (body hash did not verify) header.i=@cryptomilk.org header.s=dkim header.b=GAJ3wCsK; 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 s10si17481660edd.190.2022.02.11.05.12.46; Fri, 11 Feb 2022 05:12:47 -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=@cryptomilk.org header.s=dkim header.b=D6hxLg9b; dkim=neutral (body hash did not verify) header.i=@cryptomilk.org header.s=dkim header.b=GAJ3wCsK; 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 39CCF68B216; Fri, 11 Feb 2022 15:12:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from milliways.cryptomilk.org (milliways.cryptomilk.org [78.46.21.5]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB8E468B1D4 for ; Fri, 11 Feb 2022 15:12:36 +0200 (EET) Received: from milliways.cryptomilk.org (localhost [127.0.0.1]) by milliways.cryptomilk.org (Postfix) with ESMTPS id 64E9598D1964 for ; Fri, 11 Feb 2022 14:12:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cryptomilk.org; s=dkim; t=1644585156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7zhF/a7+JfhzNHC6znC3K3Gl9Gu76WbxxlnWtk3Y/C8=; b=D6hxLg9bBkgM49bm+h4pFMP+mMqzNvrnf5pd4ku1WCOnLvHnuSHQqKShB/Xw11EHhkWvYW JBFyjZnN9NRlIlRzJPg3oLJfeG7jtRCtM1HFOyH1innXDl5lOh6B42qD40QGKNK+3LJO9U 8HS2LH6JphDMlMjOtxyiLWKI6oD2TtgjzS64RqSLPdHQ0irlOKhS5NeFMxcOcYN7kxyQEw Bkr7/NlijGdmeXhjJKsIMvBGCnECfhiHWgidK6guYdm98rs+gaxHskzxhCXO/o6AU0KWOe BCJrtSjCdogO3k98JK4ofNKT+1HE8ySWrf+4ZXEZqk1ZxIc5Pm/R/jY2/U6LF2p1S8T0ot iRlDX+kHnuWOIVtUgPX+uL1AvlXsRHSqt+GbUYDv45FbONsuer61vQyogli8FVlifNvvOT kmFcAii3gaMUWseYicLNpUuvUxUR/EFp/1P16xOv5WW+31AIANoanxMeAUBUcwSSEc4IMQ c4EPmi9vXVPsqhk+8cnpEu0n4FyoR+Zl2Wg/bHWtsseZX8gm+Fm2wvep+phVNfB/uyyV3r bo8H3YAltb24xzSTQnhXeF4hLX3d01NG+upJ7hZNNC1CJz81InRrFVI9aX8oE/2/f+aqno qZSVYmACF60AX/rmcEpRmntDiSvTzyoNyUcTOynbP2uPTZTJCb93w= Received: from krikkit.fritz.box (unknown [IPv6:2001:a62:154a:3201:ada3:63d3:83e7:c944]) by milliways.cryptomilk.org (Postfix) with ESMTPSA id C4C6E98D1963; Fri, 11 Feb 2022 14:12:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cryptomilk.org; s=dkim; t=1644585155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7zhF/a7+JfhzNHC6znC3K3Gl9Gu76WbxxlnWtk3Y/C8=; b=GAJ3wCsK/ZYze+NUqX9CPsoCI/PVplBBhCDGMFXd96OXzPr34rDH99Swz5/A5n8yAvTb0Z g1isARDJviJluRYnx9WY3oqB3QMgH9W5CJ99YUp9Gvx7RuGhcK9dxjsTx14yP5exuZF93K FOpnulbr1qIPnt3KcaJ2ttfmQcQMBFTopPbunDRlQxf18UZ2atzK5JSDPnusjwOBDz4Qw7 uOWIVy5Ri2PSwHoZRHZAAat1eXuVdCSD70VdNn95cATL+dQqA2y7Jl+R46Eig2b9Ycnauv wsne/R2pqnn4CtYluf49lfSpVXyYevpPiI677tp/N+nHPunP4klQRz8tt0uRHI/0g7Rvzy pFQDPKLbMpTfsUP3e0O5T6CJxQrCar9vfMo5o7j4u0xLkBn81TvJSrITevAyDSmul/7IFW ioexjGbBIQ/Y2MFak7/guABtCgkc0fmfSzmcm/kacceFqvSHqH0MR9alTnZw+znLkCKCkL R8aIQ14UhWAGST++y8no/dVHS9dt4LTvw2clwJ3y/dlzCVbGJAliT4F/QxAdC4RWiLQp6P WLULt2h8UlS3Lr0Acx+b0zFm5VXNwsqfq1oPemGShilp7vH2DA9pg1w15AVZUCyTsmpk6s UozUJRsMJH0pxiyOCfRUKOjHyLFnvHgszv9GfSRg+vIt2jMPcrsUI= From: Andreas Schneider To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Feb 2022 14:11:47 +0100 Message-Id: <20220211131148.594302-2-asn@cryptomilk.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220211131148.594302-1-asn@cryptomilk.org> References: <20220211131148.594302-1-asn@cryptomilk.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/exif: Include bytestream.h for GetByteContext 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: Andreas Schneider Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gTRJh0C+cQwb bytestream.h should be directly included for GetByteContext and not rely on other headers to include it. It could be removed from there. Signed-off-by: Andreas Schneider --- libavcodec/exif.h | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/exif.h b/libavcodec/exif.h index 4db84a1c2f..310f6e8e64 100644 --- a/libavcodec/exif.h +++ b/libavcodec/exif.h @@ -30,6 +30,7 @@ #include #include "libavutil/dict.h" +#include "bytestream.h" #include "tiff.h" #define EXIF_MAX_IFD_RECURSION 2 From patchwork Fri Feb 11 13:11:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schneider X-Patchwork-Id: 34232 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp3189546nkb; Fri, 11 Feb 2022 05:12:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJwxoXZmIVfXUpUxs08bd1heHfOBRHhHxCp2ewnyDaTySL5mEwYeM/R6jT7Da3yH4/fI/eFb X-Received: by 2002:a17:907:d20:: with SMTP id gn32mr1379684ejc.338.1644585176114; Fri, 11 Feb 2022 05:12:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644585176; cv=none; d=google.com; s=arc-20160816; b=FLbKm6/gQetPpuI34SA4UFQDqQio6Bm2/m9ZKE0MGl3Zlp8GVNmChFKiXIxkqHGbQa ruCgiqn1iXQFEmKsrhYIFvkHoZBVVMz21SoAhh4xS7yfJyfDQZa4BaYPPG3U/lFSJgyg vF1w1J5huM1aDpcwr5LlXu31pKs6Dy4jyn5tKFbJCc2s2R3gU0JhfUNeokMI38Edmw12 9u64hxaGXfFte1Zs5+Mmbpkal5dz4wP5IT+jwDMwwIhNkSgi9ZCDfqLIpO2GTgay29aj PogIEJTisgGJ8z0ceVcaxxkdPC+LDntKpOf7XM+Yo4+LWvdfiIfQ8O/yRHKVohiZvQuL vs3A== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:dkim-signature:delivered-to; bh=8oEJ/rxkXJ/axlkZTxX8CI3T9YMWEKvz1BjJOE+lKsg=; b=WiMnDRlNJ8CvE95I73a797DmphA8F2QaF39Qo4/nIkVIkxzx3Ax+9QfqcPKXOlJ+Ch gBqek2xYxFuU9XVevZ9cm9RL/Cr6Jqez7NwORbvwEX5mHnZxPhIwyCds2hFYZPGoCd3J EatelV/iAqxkCPSCojHGzIb/EfTCN8rISMx6kTjIeHSMkhBEKRiodpzW5iUHuaRWiYEJ yJ/6X8uaADumE7r4Ie5V7tPJ+Xo16NFK0/76y88862CX7rnxarTCY5ZuerwVro2sRMfs TWSxvEl2LNv3D+s9AaRGKyhGliA8oVQmM8Uwc8CYUpfhCSce4/l15i/btXD2UKFfzDI+ b6GA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@cryptomilk.org header.s=dkim header.b=YsdufHtf; dkim=neutral (body hash did not verify) header.i=@cryptomilk.org header.s=dkim header.b=YsdufHtf; 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 u7si13622066eju.711.2022.02.11.05.12.55; Fri, 11 Feb 2022 05:12:56 -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=@cryptomilk.org header.s=dkim header.b=YsdufHtf; dkim=neutral (body hash did not verify) header.i=@cryptomilk.org header.s=dkim header.b=YsdufHtf; 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 3707768B250; Fri, 11 Feb 2022 15:12:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from milliways.cryptomilk.org (milliways.cryptomilk.org [78.46.21.5]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BCAE168B07E for ; Fri, 11 Feb 2022 15:12:46 +0200 (EET) Received: from milliways.cryptomilk.org (localhost [127.0.0.1]) by milliways.cryptomilk.org (Postfix) with ESMTPS id 828A898D1970 for ; Fri, 11 Feb 2022 14:12:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cryptomilk.org; s=dkim; t=1644585166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9wj6GLurAudDlIdwtgBfXqCvygkYxYg8Do+pTzIPGQs=; b=YsdufHtfn6r7rT0VcXo2R6nDoei1rkxJJVjHK3f+ZTTsp3G7K3hcvma+fglP41uYic9BBL OxSNj/A25n0eFIdvIFz2u+1fwrmXMeKaq26vbxiAJt9a5DnlrEfdrOW+wyDRD1doySO5x6 K4mxrF9TS2ynuNuO9rnvQj8T1VnF7f+VzY6pMELfzHSQ2UAasvOMTBTRfdQTMI3TsQljI8 LW1knHP+0qELFj6dj2OyVSBY89dzeHtuqs5GIOWp4uMFOqF/zSP8kaFyzl3fSpk0dai0PR XXWV324ANwjRaZnKBAK/henJXH90pGRvzDzpholtll3p+pbptAVXm7dUUUm0MovTtI+psm 86aiV7OZ444QQ8drPdAHPmQQnWMBJwXdXLtTCMlFyacHkQ/hVWpaAqQNG+jPCObNuwxkaX p8jVq7aGTtDRWl9ySG+tRdnBDTCuABzr/ksb6m6TfYzZhkXXwU/PJtPGPsSm0aigimzc3K 86AvKbVY4i3NLwmBddYmflZLNidps+kdUajjEb0SN8ml8hiIOS0G+QadJNa4YNxvYkzR+N 8CJpSf7NIOz2UrKo9aABHwwcFGEhhkQc3RGGN8I0QglgNn4FAMYtXdkA9QSE1+cznx2XeO sJ0lKW3dpEvEBswCXWvm3ZsWIFKVX+U8b714jIoAAT9itFFOzWGbE= Received: from krikkit.fritz.box (unknown [IPv6:2001:a62:154a:3201:ada3:63d3:83e7:c944]) by milliways.cryptomilk.org (Postfix) with ESMTPSA id 5346C98D196F; Fri, 11 Feb 2022 14:12:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cryptomilk.org; s=dkim; t=1644585166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9wj6GLurAudDlIdwtgBfXqCvygkYxYg8Do+pTzIPGQs=; b=YsdufHtfn6r7rT0VcXo2R6nDoei1rkxJJVjHK3f+ZTTsp3G7K3hcvma+fglP41uYic9BBL OxSNj/A25n0eFIdvIFz2u+1fwrmXMeKaq26vbxiAJt9a5DnlrEfdrOW+wyDRD1doySO5x6 K4mxrF9TS2ynuNuO9rnvQj8T1VnF7f+VzY6pMELfzHSQ2UAasvOMTBTRfdQTMI3TsQljI8 LW1knHP+0qELFj6dj2OyVSBY89dzeHtuqs5GIOWp4uMFOqF/zSP8kaFyzl3fSpk0dai0PR XXWV324ANwjRaZnKBAK/henJXH90pGRvzDzpholtll3p+pbptAVXm7dUUUm0MovTtI+psm 86aiV7OZ444QQ8drPdAHPmQQnWMBJwXdXLtTCMlFyacHkQ/hVWpaAqQNG+jPCObNuwxkaX p8jVq7aGTtDRWl9ySG+tRdnBDTCuABzr/ksb6m6TfYzZhkXXwU/PJtPGPsSm0aigimzc3K 86AvKbVY4i3NLwmBddYmflZLNidps+kdUajjEb0SN8ml8hiIOS0G+QadJNa4YNxvYkzR+N 8CJpSf7NIOz2UrKo9aABHwwcFGEhhkQc3RGGN8I0QglgNn4FAMYtXdkA9QSE1+cznx2XeO sJ0lKW3dpEvEBswCXWvm3ZsWIFKVX+U8b714jIoAAT9itFFOzWGbE= From: Andreas Schneider To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Feb 2022 14:11:48 +0100 Message-Id: <20220211131148.594302-3-asn@cryptomilk.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220211131148.594302-1-asn@cryptomilk.org> References: <20220211131148.594302-1-asn@cryptomilk.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/exif: Don't include tiff.h in exif.h 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: Andreas Schneider Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: kovdSDhoTlCn The exif.h header doesn't use anything from tiff.h. We also just need to include tiff_common.h in .c files where it actually used. Signed-off-by: Andreas Schneider --- libavcodec/exif.c | 1 + libavcodec/exif.h | 1 - libavcodec/mjpegdec.c | 1 + libavcodec/webp.c | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/exif.c b/libavcodec/exif.c index 0b656fd09b..9485b24b8e 100644 --- a/libavcodec/exif.c +++ b/libavcodec/exif.c @@ -26,6 +26,7 @@ */ #include "exif.h" +#include "tiff_common.h" static const char *exif_get_tag_name(uint16_t id) diff --git a/libavcodec/exif.h b/libavcodec/exif.h index 310f6e8e64..ffacba7e66 100644 --- a/libavcodec/exif.h +++ b/libavcodec/exif.h @@ -31,7 +31,6 @@ #include #include "libavutil/dict.h" #include "bytestream.h" -#include "tiff.h" #define EXIF_MAX_IFD_RECURSION 2 #define EXIF_TAG_NAME_LENGTH 32 diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index a735d2337d..267609d96a 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -50,6 +50,7 @@ #include "tiff.h" #include "exif.h" #include "bytestream.h" +#include "tiff_common.h" static int init_default_huffman_tables(MJpegDecodeContext *s) diff --git a/libavcodec/webp.c b/libavcodec/webp.c index 9e642e050a..148dc02170 100644 --- a/libavcodec/webp.c +++ b/libavcodec/webp.c @@ -48,6 +48,7 @@ #include "exif.h" #include "get_bits.h" #include "internal.h" +#include "tiff_common.h" #include "thread.h" #include "vp8.h"