From patchwork Mon Jun 14 22:41:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28275 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp3247303iol; Mon, 14 Jun 2021 15:43:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4oqQ8gzQjQUAK9GdG7Q9LWQ9hcCNddQq64RZySSCDFdOGRB/qFZFa5HITck5Tg20+7LqI X-Received: by 2002:a17:906:1790:: with SMTP id t16mr17285105eje.203.1623710589510; Mon, 14 Jun 2021 15:43:09 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c8si12019324edr.306.2021.06.14.15.43.09; Mon, 14 Jun 2021 15:43:09 -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=@outlook.com header.s=selector1 header.b=U5U0t0uO; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3924B689ADE; Tue, 15 Jun 2021 01:42:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-DB8-obe.outbound.protection.outlook.com (mail-db8eur06olkn2019.outbound.protection.outlook.com [40.92.51.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB55C689A12 for ; Tue, 15 Jun 2021 01:42:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U/T1RCqTPBlr7F9MwkXX8gSQKJqrhG59+st9AijeAzyZVCjXb2tu3yWl3iaNU+TDI6kChoRevYSL2AxostYNMYOUqHlQle5qN+qrtvvjRSJozsNRtXSGta5vtxocrZ9AVRxXw4chFuuQBB5D10yRLFuWGcpY9Lr6y5JkGyxCIklcStOEMker1hjEvixwjkBNvWClxtDD7S/89KmHiyp1A9eKZgmA23jnm4TLhRw9ii6n80l/AhsUcdOzXov/Hj3n1/QP7xjOQVJWr5WX/Vh0oK6ULV06nXaevGpOJblZVNx2r+nSk8glTWLuXPXKdrzanzRt863iW9VOmO3bbkd+zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KTRTsoa9vNhqEjPbK+WjIFcugWm3JL2zFVQCGkoH8Ts=; b=KxZfQylgRurWQ6KwxcVdccNWXDtdt1KWWDoITuE81315XJZtaSQfmNlVMMYbiBp9kAMP69fQBHalagccWnsCGzgsEAuqasYIKjD1ocU2R0kqauhLFsAIQdWfk6mfV7lt98UVOH2sJhz6+W6uSN2VVo/V+9eHhkaTMBDmr9HZTZHsSCRe/aedH57dsphpkEuS7NpG58B6YGOtpiaW+VYrI53j+sx9l4sYLZQL8PX8DVBV900C751ynmgQ2t4ehrPBj7zDk2Ix1nGi/sRC79vtgHh7NsdKGml/Ay/7fyZz2K+Egxp6QspS3nwCXuz1d8i36FXv98os6WNelsXXkC+M/g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KTRTsoa9vNhqEjPbK+WjIFcugWm3JL2zFVQCGkoH8Ts=; b=U5U0t0uOWqbPoctyzfnjctIGJSztyPwnjbqRzY5rCPYJFVBr+3eCM0Pu8/d7mD5kmj85RC28sVGunDKA3GJRvXnAx11PpM6tYEpF1kok4GTH67Tli52OHZ+lJ7DP27ufO18/WE5wnGeW9NspTcKilj2bdMoZTITQJUQskoqr+U09gqIe64kyzCeSaHpjz19W43zaUl16VNxdSc/jZbtbsUzkA1tXwa5KpHS1/7q97wdG8qnr2ScL/igqUqyYUBTPNKEnK8m65emiPqjSbLuJ8fmZ9spQJf3D3VzkRx6Toz30GbeDw5L0mzwnYVauksY6vRB66nXIGFcRn/X6woRw8g== Received: from DB8EUR06FT015.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::48) by DB8EUR06HT126.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Mon, 14 Jun 2021 22:42:01 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc35::46) by DB8EUR06FT015.mail.protection.outlook.com (2a01:111:e400:fc35::156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Mon, 14 Jun 2021 22:42:01 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:FAE1D1266564698B234D828B0EB507962CB5D3F6AD4EB1671033D0E8EBA952AB; UpperCasedChecksum:F69E1144D745F6E008EF6DC99CEFB33044BCD7B445265D7E5DF090786775364C; SizeAsReceived:7577; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb%6]) with mapi id 15.20.4219.025; Mon, 14 Jun 2021 22:42:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Jun 2021 00:41:25 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [/YUTM5d1jvhLglCw5hy26vCVERECQS4A] X-ClientProxiedBy: AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210614224134.1029350-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Mon, 14 Jun 2021 22:42:00 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: bf7dcc56-9a6e-45cc-198d-08d92f859ff7 X-MS-TrafficTypeDiagnostic: DB8EUR06HT126: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Z5QF1ro1lGGe1aWmYIq/lOF/Gmoyjn9F1zbFf+2kGLx7joPZM+9bsOZqroTOlhu94iD7i1V6Z3SOS945h4k+/Diem0NsfVgWLRpQkN+wEVryx9inlLTE7MDvCHmeU2Tig9xRKhvV9YoKED/Y7dZJfGHFgPKbaapdmUuqfF8RVd5b8dhDh730nvjmus6ZURFfScaskXkWZIAvI0tvHsUkPpXaDOOqOM9nemFyAJKWUWDN3hkS8Dp0MBQkhObKh1E7CzJMi/W+gZWf98S/cF2bETkkkxILS8XAJrP+OZ6FFP8T2AdCzCuqbOvSH7MHiBb9NycXSdYMEg6xQfFsOhp+Kc4aSlbY4x4h/cIsMXXIfdI45bGqXuO0Vin0UOvJumLRuQe4buJFijSXb+Ok7gyg0g== X-MS-Exchange-AntiSpam-MessageData: PCxozQKl/tDSyTfd6pxJfBEZi7B+rjr9JvtkcabDyRU9eiEW+s0t8E0SihOq0X09+Qqk/gKUYPUI+TqSJt/vUBrQBQkyk4kzKLliCGPUtqMdizYiKfNIG9RO4Qooakc9aWqxAshRv0UaOiuvYQMMFw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bf7dcc56-9a6e-45cc-198d-08d92f859ff7 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2021 22:42:01.3091 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT015.eop-eur06.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8EUR06HT126 Subject: [FFmpeg-devel] [PATCH 09/17] Remove unnecessary mem.h inclusions 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 Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qDuCk6UlFTsM From: Andreas Rheinhardt Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg_qsv.c | 1 - libavcodec/aactab.c | 1 - libavcodec/arbc.c | 1 - libavcodec/argo.c | 1 - libavcodec/dcadsp.c | 1 - libavcodec/dss_sp.c | 1 - libavcodec/dvbsub_parser.c | 1 - libavcodec/h264_redundant_pps_bsf.c | 1 - libavcodec/libvo-amrwbenc.c | 1 - libavcodec/mpegaudiodsp_template.c | 1 - libavcodec/opustab.h | 2 -- libavcodec/rl.c | 1 - libavcodec/snappy.c | 2 -- libavcodec/truemotion2rt.c | 1 - libavcodec/v210dec.c | 1 - libavcodec/v210x.c | 1 - libavcodec/x86/ac3dsp_init.c | 1 - libavcodec/x86/lpc.c | 2 +- libavcodec/x86/rv40dsp_init.c | 1 - libavcodec/x86/vc1dsp_mmx.c | 1 - libavcodec/x86/videodsp_init.c | 1 - libavcodec/x86/vp8dsp_init.c | 1 - libavcodec/x86/vp9dsp_init.c | 1 - libavcodec/x86/vp9dsp_init_16bpp_template.c | 1 - libavdevice/fbdev_dec.c | 1 - libavdevice/fbdev_enc.c | 1 - libavdevice/libcdio.c | 1 - libavfilter/boxblur.h | 1 - libavfilter/drawutils.c | 1 - libavfilter/vf_deinterlace_vaapi.c | 1 - libavfilter/vf_misc_vaapi.c | 1 - libavfilter/vf_neighbor_opencl.c | 1 - libavfilter/vf_overlay_cuda.c | 1 - libavfilter/vf_overlay_opencl.c | 1 - libavfilter/vf_procamp_vaapi.c | 1 - libavfilter/vf_scale_vaapi.c | 1 - libavfilter/vf_tonemap_opencl.c | 1 - libavfilter/vf_tonemap_vaapi.c | 1 - libavfilter/vf_transpose_opencl.c | 1 - libavfilter/vf_transpose_vaapi.c | 1 - libavfilter/vf_xfade_opencl.c | 1 - libavfilter/video.c | 1 - libavfilter/x86/vf_atadenoise_init.c | 1 - libavfilter/x86/vf_bwdif_init.c | 1 - libavfilter/x86/vf_eq_init.c | 1 - libavfilter/x86/vf_gradfun_init.c | 1 - libavfilter/x86/vf_idet_init.c | 1 - libavfilter/x86/vf_maskedclamp_init.c | 1 - libavfilter/x86/vf_transpose_init.c | 1 - libavfilter/x86/vf_w3fdif_init.c | 1 - libavfilter/x86/vf_yadif_init.c | 1 - libavformat/replaygain.c | 1 - libavutil/avsscanf.c | 1 - libavutil/tests/aes_ctr.c | 1 - tests/checkasm/llviddspenc.c | 1 - tests/checkasm/sw_rgb.c | 1 - tests/checkasm/sw_scale.c | 1 - tools/ffhash.c | 2 +- 58 files changed, 2 insertions(+), 60 deletions(-) diff --git a/fftools/ffmpeg_qsv.c b/fftools/ffmpeg_qsv.c index 960c88b69d..7bd999d310 100644 --- a/fftools/ffmpeg_qsv.c +++ b/fftools/ffmpeg_qsv.c @@ -22,7 +22,6 @@ #include "libavutil/dict.h" #include "libavutil/hwcontext.h" #include "libavutil/hwcontext_qsv.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavcodec/qsv.h" diff --git a/libavcodec/aactab.c b/libavcodec/aactab.c index fa5420fec6..0553f41a61 100644 --- a/libavcodec/aactab.c +++ b/libavcodec/aactab.c @@ -28,7 +28,6 @@ */ #include "config.h" -#include "libavutil/mem.h" #include "libavutil/mem_internal.h" #include "libavutil/thread.h" #include "aac.h" diff --git a/libavcodec/arbc.c b/libavcodec/arbc.c index 0f83a68758..d03fdf214b 100644 --- a/libavcodec/arbc.c +++ b/libavcodec/arbc.c @@ -26,7 +26,6 @@ #include "libavutil/imgutils.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" -#include "libavutil/mem.h" #include "avcodec.h" #include "bytestream.h" diff --git a/libavcodec/argo.c b/libavcodec/argo.c index 87c646f56c..94c65477c5 100644 --- a/libavcodec/argo.c +++ b/libavcodec/argo.c @@ -26,7 +26,6 @@ #include "libavutil/imgutils.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" -#include "libavutil/mem.h" #include "avcodec.h" #include "bytestream.h" diff --git a/libavcodec/dcadsp.c b/libavcodec/dcadsp.c index 9d00ebd281..e424a7443c 100644 --- a/libavcodec/dcadsp.c +++ b/libavcodec/dcadsp.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/mem.h" #include "libavutil/mem_internal.h" #include "dcadsp.h" diff --git a/libavcodec/dss_sp.c b/libavcodec/dss_sp.c index b904585b5d..050b412496 100644 --- a/libavcodec/dss_sp.c +++ b/libavcodec/dss_sp.c @@ -21,7 +21,6 @@ #include "libavutil/channel_layout.h" #include "libavutil/common.h" -#include "libavutil/mem.h" #include "libavutil/mem_internal.h" #include "libavutil/opt.h" diff --git a/libavcodec/dvbsub_parser.c b/libavcodec/dvbsub_parser.c index 3dd97200b4..88bf5b9d74 100644 --- a/libavcodec/dvbsub_parser.c +++ b/libavcodec/dvbsub_parser.c @@ -23,7 +23,6 @@ #include #include "libavutil/intreadwrite.h" -#include "libavutil/mem.h" #include "avcodec.h" #include "internal.h" diff --git a/libavcodec/h264_redundant_pps_bsf.c b/libavcodec/h264_redundant_pps_bsf.c index 6ba40291d5..fb678beef3 100644 --- a/libavcodec/h264_redundant_pps_bsf.c +++ b/libavcodec/h264_redundant_pps_bsf.c @@ -19,7 +19,6 @@ #include #include "libavutil/common.h" -#include "libavutil/mem.h" #include "bsf.h" #include "bsf_internal.h" diff --git a/libavcodec/libvo-amrwbenc.c b/libavcodec/libvo-amrwbenc.c index dcc0071a36..9c7c91b617 100644 --- a/libavcodec/libvo-amrwbenc.c +++ b/libavcodec/libvo-amrwbenc.c @@ -25,7 +25,6 @@ #include "libavutil/avstring.h" #include "libavutil/internal.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "avcodec.h" #include "encode.h" diff --git a/libavcodec/mpegaudiodsp_template.c b/libavcodec/mpegaudiodsp_template.c index 97317967a2..fbbd94e486 100644 --- a/libavcodec/mpegaudiodsp_template.c +++ b/libavcodec/mpegaudiodsp_template.c @@ -21,7 +21,6 @@ #include #include "libavutil/attributes.h" -#include "libavutil/mem.h" #include "libavutil/mem_internal.h" #include "libavutil/thread.h" diff --git a/libavcodec/opustab.h b/libavcodec/opustab.h index 4525837942..16011db758 100644 --- a/libavcodec/opustab.h +++ b/libavcodec/opustab.h @@ -23,8 +23,6 @@ #ifndef AVCODEC_OPUSTAB_H #define AVCODEC_OPUSTAB_H -#include "libavutil/mem.h" - #include extern const uint8_t ff_celt_band_end[]; diff --git a/libavcodec/rl.c b/libavcodec/rl.c index 93153ff723..fab96d63a1 100644 --- a/libavcodec/rl.c +++ b/libavcodec/rl.c @@ -21,7 +21,6 @@ #include "libavutil/attributes.h" #include "libavutil/avassert.h" -#include "libavutil/mem.h" #include "rl.h" diff --git a/libavcodec/snappy.c b/libavcodec/snappy.c index f5c4c6578b..91dd84fad4 100644 --- a/libavcodec/snappy.c +++ b/libavcodec/snappy.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/mem.h" - #include "bytestream.h" #include "snappy.h" diff --git a/libavcodec/truemotion2rt.c b/libavcodec/truemotion2rt.c index a2206a60e0..b6a19581a9 100644 --- a/libavcodec/truemotion2rt.c +++ b/libavcodec/truemotion2rt.c @@ -25,7 +25,6 @@ #include "libavutil/imgutils.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" -#include "libavutil/mem.h" #define BITSTREAM_READER_LE #include "avcodec.h" diff --git a/libavcodec/v210dec.c b/libavcodec/v210dec.c index fe63518c3c..0c95728781 100644 --- a/libavcodec/v210dec.c +++ b/libavcodec/v210dec.c @@ -26,7 +26,6 @@ #include "v210dec.h" #include "libavutil/bswap.h" #include "libavutil/internal.h" -#include "libavutil/mem.h" #include "libavutil/intreadwrite.h" #include "thread.h" diff --git a/libavcodec/v210x.c b/libavcodec/v210x.c index 88143d16d1..797f229a28 100644 --- a/libavcodec/v210x.c +++ b/libavcodec/v210x.c @@ -22,7 +22,6 @@ #include "internal.h" #include "libavutil/bswap.h" #include "libavutil/internal.h" -#include "libavutil/mem.h" static av_cold int decode_init(AVCodecContext *avctx) { diff --git a/libavcodec/x86/ac3dsp_init.c b/libavcodec/x86/ac3dsp_init.c index 2ae762af46..923c3e0a31 100644 --- a/libavcodec/x86/ac3dsp_init.c +++ b/libavcodec/x86/ac3dsp_init.c @@ -20,7 +20,6 @@ */ #include "libavutil/attributes.h" -#include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavcodec/ac3.h" diff --git a/libavcodec/x86/lpc.c b/libavcodec/x86/lpc.c index 6c72e21bac..544083bd37 100644 --- a/libavcodec/x86/lpc.c +++ b/libavcodec/x86/lpc.c @@ -21,7 +21,7 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" +#include "libavutil/mem_internal.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavcodec/lpc.h" diff --git a/libavcodec/x86/rv40dsp_init.c b/libavcodec/x86/rv40dsp_init.c index 79a617ffbe..7a05ab14ad 100644 --- a/libavcodec/x86/rv40dsp_init.c +++ b/libavcodec/x86/rv40dsp_init.c @@ -28,7 +28,6 @@ #include "libavcodec/rv34dsp.h" #include "libavutil/attributes.h" -#include "libavutil/mem.h" #include "libavutil/mem_internal.h" #include "libavutil/x86/cpu.h" #include "hpeldsp.h" diff --git a/libavcodec/x86/vc1dsp_mmx.c b/libavcodec/x86/vc1dsp_mmx.c index c1c4d76262..4294b86028 100644 --- a/libavcodec/x86/vc1dsp_mmx.c +++ b/libavcodec/x86/vc1dsp_mmx.c @@ -26,7 +26,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/mem_internal.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" diff --git a/libavcodec/x86/videodsp_init.c b/libavcodec/x86/videodsp_init.c index eeebb41547..961424aa13 100644 --- a/libavcodec/x86/videodsp_init.c +++ b/libavcodec/x86/videodsp_init.c @@ -24,7 +24,6 @@ #include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavcodec/videodsp.h" diff --git a/libavcodec/x86/vp8dsp_init.c b/libavcodec/x86/vp8dsp_init.c index dffa7a2418..289f1d5115 100644 --- a/libavcodec/x86/vp8dsp_init.c +++ b/libavcodec/x86/vp8dsp_init.c @@ -22,7 +22,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/mem_internal.h" #include "libavutil/x86/cpu.h" #include "libavcodec/vp8dsp.h" diff --git a/libavcodec/x86/vp9dsp_init.c b/libavcodec/x86/vp9dsp_init.c index 837cce8508..8d11dbc348 100644 --- a/libavcodec/x86/vp9dsp_init.c +++ b/libavcodec/x86/vp9dsp_init.c @@ -22,7 +22,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/x86/cpu.h" #include "libavcodec/vp9dsp.h" #include "libavcodec/x86/vp9dsp_init.h" diff --git a/libavcodec/x86/vp9dsp_init_16bpp_template.c b/libavcodec/x86/vp9dsp_init_16bpp_template.c index b56afc7f50..f93ea2468e 100644 --- a/libavcodec/x86/vp9dsp_init_16bpp_template.c +++ b/libavcodec/x86/vp9dsp_init_16bpp_template.c @@ -22,7 +22,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/x86/cpu.h" #include "libavcodec/vp9dsp.h" #include "libavcodec/x86/vp9dsp_init.h" diff --git a/libavdevice/fbdev_dec.c b/libavdevice/fbdev_dec.c index b73f31f1ef..368907037b 100644 --- a/libavdevice/fbdev_dec.c +++ b/libavdevice/fbdev_dec.c @@ -36,7 +36,6 @@ #include "libavutil/internal.h" #include "libavutil/log.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/time.h" #include "libavutil/parseutils.h" diff --git a/libavdevice/fbdev_enc.c b/libavdevice/fbdev_enc.c index e8d8d7b85b..898a630aa1 100644 --- a/libavdevice/fbdev_enc.c +++ b/libavdevice/fbdev_enc.c @@ -25,7 +25,6 @@ #include #include "libavutil/pixdesc.h" #include "libavutil/log.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavformat/avformat.h" #include "fbdev_common.h" diff --git a/libavdevice/libcdio.c b/libavdevice/libcdio.c index dba02d4130..623878fe7f 100644 --- a/libavdevice/libcdio.c +++ b/libavdevice/libcdio.c @@ -34,7 +34,6 @@ #endif #include "libavutil/log.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavformat/avformat.h" diff --git a/libavfilter/boxblur.h b/libavfilter/boxblur.h index 5694722a9d..214d4e0c93 100644 --- a/libavfilter/boxblur.h +++ b/libavfilter/boxblur.h @@ -25,7 +25,6 @@ #include "libavutil/eval.h" #include "libavutil/pixdesc.h" -#include "libavutil/mem.h" #include "avfilter.h" diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c index f95e12091b..9bfb96211d 100644 --- a/libavfilter/drawutils.c +++ b/libavfilter/drawutils.c @@ -25,7 +25,6 @@ #include "libavutil/avutil.h" #include "libavutil/colorspace.h" #include "libavutil/intreadwrite.h" -#include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "drawutils.h" #include "formats.h" diff --git a/libavfilter/vf_deinterlace_vaapi.c b/libavfilter/vf_deinterlace_vaapi.c index 0e645f50f2..b05d1f2393 100644 --- a/libavfilter/vf_deinterlace_vaapi.c +++ b/libavfilter/vf_deinterlace_vaapi.c @@ -20,7 +20,6 @@ #include "libavutil/avassert.h" #include "libavutil/common.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_misc_vaapi.c b/libavfilter/vf_misc_vaapi.c index 08a0917258..8bfdcdfa07 100644 --- a/libavfilter/vf_misc_vaapi.c +++ b/libavfilter/vf_misc_vaapi.c @@ -18,7 +18,6 @@ #include #include "libavutil/avassert.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_neighbor_opencl.c b/libavfilter/vf_neighbor_opencl.c index a41fd384a1..e00245089d 100644 --- a/libavfilter/vf_neighbor_opencl.c +++ b/libavfilter/vf_neighbor_opencl.c @@ -20,7 +20,6 @@ #include "libavutil/common.h" #include "libavutil/imgutils.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavutil/avstring.h" diff --git a/libavfilter/vf_overlay_cuda.c b/libavfilter/vf_overlay_cuda.c index 260b5c8fa2..5c578083c6 100644 --- a/libavfilter/vf_overlay_cuda.c +++ b/libavfilter/vf_overlay_cuda.c @@ -24,7 +24,6 @@ */ #include "libavutil/log.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavutil/hwcontext.h" diff --git a/libavfilter/vf_overlay_opencl.c b/libavfilter/vf_overlay_opencl.c index 8547bae278..6ba622baaa 100644 --- a/libavfilter/vf_overlay_opencl.c +++ b/libavfilter/vf_overlay_opencl.c @@ -17,7 +17,6 @@ */ #include "libavutil/log.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_procamp_vaapi.c b/libavfilter/vf_procamp_vaapi.c index 9d0c813e6d..efc2ab832d 100644 --- a/libavfilter/vf_procamp_vaapi.c +++ b/libavfilter/vf_procamp_vaapi.c @@ -18,7 +18,6 @@ #include #include "libavutil/avassert.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_scale_vaapi.c b/libavfilter/vf_scale_vaapi.c index 0f0c5440e9..f914fd2cd7 100644 --- a/libavfilter/vf_scale_vaapi.c +++ b/libavfilter/vf_scale_vaapi.c @@ -19,7 +19,6 @@ #include #include "libavutil/avassert.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_tonemap_opencl.c b/libavfilter/vf_tonemap_opencl.c index e85b3bb3ba..8cf7c099ee 100644 --- a/libavfilter/vf_tonemap_opencl.c +++ b/libavfilter/vf_tonemap_opencl.c @@ -20,7 +20,6 @@ #include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/imgutils.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_tonemap_vaapi.c b/libavfilter/vf_tonemap_vaapi.c index 179f7d77b9..9b3e2ad03b 100644 --- a/libavfilter/vf_tonemap_vaapi.c +++ b/libavfilter/vf_tonemap_vaapi.c @@ -18,7 +18,6 @@ #include #include "libavutil/avassert.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavutil/mastering_display_metadata.h" diff --git a/libavfilter/vf_transpose_opencl.c b/libavfilter/vf_transpose_opencl.c index f325d6633b..d354c3a4eb 100644 --- a/libavfilter/vf_transpose_opencl.c +++ b/libavfilter/vf_transpose_opencl.c @@ -20,7 +20,6 @@ #include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/imgutils.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_transpose_vaapi.c b/libavfilter/vf_transpose_vaapi.c index 3b29767c8d..2abe8517e0 100644 --- a/libavfilter/vf_transpose_vaapi.c +++ b/libavfilter/vf_transpose_vaapi.c @@ -18,7 +18,6 @@ #include #include "libavutil/avassert.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_xfade_opencl.c b/libavfilter/vf_xfade_opencl.c index 23c084546d..5b64ea2f08 100644 --- a/libavfilter/vf_xfade_opencl.c +++ b/libavfilter/vf_xfade_opencl.c @@ -17,7 +17,6 @@ */ #include "libavutil/log.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/video.c b/libavfilter/video.c index 7a8e587798..ee1d440bb2 100644 --- a/libavfilter/video.c +++ b/libavfilter/video.c @@ -27,7 +27,6 @@ #include "libavutil/buffer.h" #include "libavutil/hwcontext.h" #include "libavutil/imgutils.h" -#include "libavutil/mem.h" #include "avfilter.h" #include "internal.h" diff --git a/libavfilter/x86/vf_atadenoise_init.c b/libavfilter/x86/vf_atadenoise_init.c index 3f87f3c445..e7a653f191 100644 --- a/libavfilter/x86/vf_atadenoise_init.c +++ b/libavfilter/x86/vf_atadenoise_init.c @@ -20,7 +20,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavfilter/atadenoise.h" diff --git a/libavfilter/x86/vf_bwdif_init.c b/libavfilter/x86/vf_bwdif_init.c index b1e70b3bc6..f632c4f340 100644 --- a/libavfilter/x86/vf_bwdif_init.c +++ b/libavfilter/x86/vf_bwdif_init.c @@ -20,7 +20,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavfilter/bwdif.h" diff --git a/libavfilter/x86/vf_eq_init.c b/libavfilter/x86/vf_eq_init.c index 274325074a..113056e76b 100644 --- a/libavfilter/x86/vf_eq_init.c +++ b/libavfilter/x86/vf_eq_init.c @@ -21,7 +21,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/x86/cpu.h" #include "libavutil/x86/asm.h" #include "libavfilter/vf_eq.h" diff --git a/libavfilter/x86/vf_gradfun_init.c b/libavfilter/x86/vf_gradfun_init.c index 4009711701..56e6774a79 100644 --- a/libavfilter/x86/vf_gradfun_init.c +++ b/libavfilter/x86/vf_gradfun_init.c @@ -21,7 +21,6 @@ #include "config.h" #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/x86/cpu.h" #include "libavfilter/gradfun.h" diff --git a/libavfilter/x86/vf_idet_init.c b/libavfilter/x86/vf_idet_init.c index ca175e2d40..d4d9bd0893 100644 --- a/libavfilter/x86/vf_idet_init.c +++ b/libavfilter/x86/vf_idet_init.c @@ -18,7 +18,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavfilter/vf_idet.h" diff --git a/libavfilter/x86/vf_maskedclamp_init.c b/libavfilter/x86/vf_maskedclamp_init.c index 53153f80ea..2a5388abac 100644 --- a/libavfilter/x86/vf_maskedclamp_init.c +++ b/libavfilter/x86/vf_maskedclamp_init.c @@ -20,7 +20,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavfilter/maskedclamp.h" diff --git a/libavfilter/x86/vf_transpose_init.c b/libavfilter/x86/vf_transpose_init.c index 6bb9908725..95c56eab73 100644 --- a/libavfilter/x86/vf_transpose_init.c +++ b/libavfilter/x86/vf_transpose_init.c @@ -20,7 +20,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavfilter/transpose.h" diff --git a/libavfilter/x86/vf_w3fdif_init.c b/libavfilter/x86/vf_w3fdif_init.c index d4534bb1ed..16202fba76 100644 --- a/libavfilter/x86/vf_w3fdif_init.c +++ b/libavfilter/x86/vf_w3fdif_init.c @@ -20,7 +20,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavfilter/w3fdif.h" diff --git a/libavfilter/x86/vf_yadif_init.c b/libavfilter/x86/vf_yadif_init.c index c39bc44da6..66cbee8510 100644 --- a/libavfilter/x86/vf_yadif_init.c +++ b/libavfilter/x86/vf_yadif_init.c @@ -20,7 +20,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/x86/cpu.h" #include "libavfilter/yadif.h" diff --git a/libavformat/replaygain.c b/libavformat/replaygain.c index 707d3cd4f1..24f5c74183 100644 --- a/libavformat/replaygain.c +++ b/libavformat/replaygain.c @@ -29,7 +29,6 @@ #include "libavutil/dict.h" #include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" -#include "libavutil/mem.h" #include "libavutil/replaygain.h" #include "avformat.h" diff --git a/libavutil/avsscanf.c b/libavutil/avsscanf.c index b7f0f71c2d..a20cb15b01 100644 --- a/libavutil/avsscanf.c +++ b/libavutil/avsscanf.c @@ -29,7 +29,6 @@ #include "config.h" #include "common.h" -#include "mem.h" #include "avassert.h" #include "avstring.h" #include "bprint.h" diff --git a/libavutil/tests/aes_ctr.c b/libavutil/tests/aes_ctr.c index 53d0e4a244..9dbf0af8aa 100644 --- a/libavutil/tests/aes_ctr.c +++ b/libavutil/tests/aes_ctr.c @@ -17,7 +17,6 @@ */ #include "libavutil/log.h" -#include "libavutil/mem.h" #include "libavutil/mem_internal.h" #include "libavutil/aes_ctr.h" diff --git a/tests/checkasm/llviddspenc.c b/tests/checkasm/llviddspenc.c index 132f6d2771..4ec46c96bd 100644 --- a/tests/checkasm/llviddspenc.c +++ b/tests/checkasm/llviddspenc.c @@ -22,7 +22,6 @@ #include "libavutil/common.h" #include "libavutil/intreadwrite.h" -#include "libavutil/mem.h" #include "libavutil/mem_internal.h" #include "libavcodec/lossless_videoencdsp.h" diff --git a/tests/checkasm/sw_rgb.c b/tests/checkasm/sw_rgb.c index c29b75d09b..7cd815e5be 100644 --- a/tests/checkasm/sw_rgb.c +++ b/tests/checkasm/sw_rgb.c @@ -21,7 +21,6 @@ #include "libavutil/common.h" #include "libavutil/intreadwrite.h" -#include "libavutil/mem.h" #include "libavutil/mem_internal.h" #include "libswscale/rgb2rgb.h" diff --git a/tests/checkasm/sw_scale.c b/tests/checkasm/sw_scale.c index 3ac0f9082f..02fd939e13 100644 --- a/tests/checkasm/sw_scale.c +++ b/tests/checkasm/sw_scale.c @@ -21,7 +21,6 @@ #include "libavutil/common.h" #include "libavutil/intreadwrite.h" -#include "libavutil/mem.h" #include "libavutil/mem_internal.h" #include "libswscale/swscale.h" diff --git a/tools/ffhash.c b/tools/ffhash.c index 6942527732..9aa5ffdf88 100644 --- a/tools/ffhash.c +++ b/tools/ffhash.c @@ -24,11 +24,11 @@ #include "libavutil/avstring.h" #include "libavutil/error.h" #include "libavutil/hash.h" -#include "libavutil/mem.h" #include #include #include +#include #include #if HAVE_IO_H