From patchwork Wed Dec 25 20:13:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: vitamin-caig X-Patchwork-Id: 16943 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id A93B044832C for ; Wed, 25 Dec 2019 22:21:33 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E07D68AABF; Wed, 25 Dec 2019 22:21:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f66.google.com (mail-lf1-f66.google.com [209.85.167.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 092A36881D9 for ; Wed, 25 Dec 2019 22:21:27 +0200 (EET) Received: by mail-lf1-f66.google.com with SMTP id 15so17280335lfr.2 for ; Wed, 25 Dec 2019 12:21:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=/B3465RatVfu5wBGmepcdVT8mh9AK2p95GJUkmpygg4=; b=P8i5pFr0lIRZNwJm+IAeZ7nuJjpkl3BySeTVKVchXxhC6Oqs5SuWLLW7rsv3nUdEJe ZlvhhRyrJ5SyE1DWc2a6LGIqodo1u80vCMLDvpI5xu18T5ApqH0cmbccsdbs8j5Yq8iB patYa8F8ThOohCEGZuFWr7S5VoxKpZMxcApMiMMfVefq0BZBQyhPGlxXoSQvyJCeep0M OF41mGJ2ccdoYPuTsAdCPSdBkfInSJeeWLxVqzBD7UJtEn4OVU3CVSfP1aXshjrKCwXY vgpHL/2CmjKgrc6ODK03Y9Ht5uN2XKcL9fHtMwna37MoHCdLHEAw4AFCaUsnFCtOgqnW gjRw== 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:mime-version :content-transfer-encoding; bh=/B3465RatVfu5wBGmepcdVT8mh9AK2p95GJUkmpygg4=; b=bEM/VGSYdlGDyKxKOuMQBeEjmaRdYgnTZi92MlY9cHQiXXpkYCarhMQc3tAHcaglCo MLH2Mk2Nd2nrNQ7V99u6Z32CIREly0ckOHTCM6HV3OBW0zOu+voveKgxVzKmpZ7nXuTm yT7FuE2UiQkDONr/DkkA8clxxfuzABQpmrFL4KjESBqm+sO1V0SZbdAjLP5c/oOJkI6Q h9p+YhJ8Plo3d9Px6OT8XBNcgqWkmrY/HPplbI9vPv+GIpTkZNVJxJraoh2zJp2HUlW8 RwLU/zpNhSPHwTS20oTsze6VrGugICTtmVm/suS9QUiIxFiD3DVNTt4uSYLsICYxLMMi G/CA== X-Gm-Message-State: APjAAAVI10Df6oG1LJl/WocHiepsBl8KkIH7TspFgIMhNv/msqoXd51V y7/gfKUWjlQeuzss+yyIhtZly7J/ X-Google-Smtp-Source: APXvYqweKX6B0VK0XN1sl63H9EyK/KwOH+yQqevk9QeO1jDYYFomR1TUCrVb2zYS+OL0ESsDdOOkBw== X-Received: by 2002:a19:784:: with SMTP id 126mr23317825lfh.191.1577304813748; Wed, 25 Dec 2019 12:13:33 -0800 (PST) Received: from localhost.localdomain (95-165-142-69.static.spd-mgts.ru. [95.165.142.69]) by smtp.gmail.com with ESMTPSA id m16sm11549440ljb.47.2019.12.25.12.13.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Dec 2019 12:13:33 -0800 (PST) From: vitamin-caig To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Dec 2019 23:13:32 +0300 Message-Id: <20191225201332.28694-1-vitamin.caig@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc: remove not required includes, relocate some functions 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: vitamin-caig --- libavcodec/raw.c | 11 +++++++++++ libavcodec/raw.h | 2 -- libavcodec/rawdec.c | 2 +- libavcodec/utils.c | 12 ------------ 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/libavcodec/raw.c b/libavcodec/raw.c index b6fb91c1c6..96b7442f51 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -301,6 +301,17 @@ const struct PixelFormatTag *avpriv_get_raw_pix_fmt_tags(void) return ff_raw_pix_fmt_tags; } +enum AVPixelFormat avpriv_find_pix_fmt(const PixelFormatTag *tags, + unsigned int fourcc) +{ + while (tags->pix_fmt >= 0) { + if (tags->fourcc == fourcc) + return tags->pix_fmt; + tags++; + } + return AV_PIX_FMT_NONE; +} + unsigned int avcodec_pix_fmt_to_codec_tag(enum AVPixelFormat fmt) { const PixelFormatTag *tags = ff_raw_pix_fmt_tags; diff --git a/libavcodec/raw.h b/libavcodec/raw.h index 28a27b1f9e..af3dd4fb79 100644 --- a/libavcodec/raw.h +++ b/libavcodec/raw.h @@ -36,8 +36,6 @@ typedef struct PixelFormatTag { unsigned int fourcc; } PixelFormatTag; -extern const PixelFormatTag ff_raw_pix_fmt_tags[]; // exposed through avpriv_get_raw_pix_fmt_tags() - const struct PixelFormatTag *avpriv_get_raw_pix_fmt_tags(void); enum AVPixelFormat avpriv_find_pix_fmt(const PixelFormatTag *tags, unsigned int fourcc); diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index 0b2d8708e6..a99f1a2c52 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -81,7 +81,7 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx) avctx->pix_fmt = avpriv_find_pix_fmt(avpriv_pix_fmt_bps_avi, avctx->bits_per_coded_sample); else if (avctx->codec_tag && (avctx->codec_tag & 0xFFFFFF) != MKTAG('B','I','T', 0)) - avctx->pix_fmt = avpriv_find_pix_fmt(ff_raw_pix_fmt_tags, avctx->codec_tag); + avctx->pix_fmt = avpriv_find_pix_fmt(avpriv_get_raw_pix_fmt_tags(), avctx->codec_tag); else if (avctx->pix_fmt == AV_PIX_FMT_NONE && avctx->bits_per_coded_sample) avctx->pix_fmt = avpriv_find_pix_fmt(avpriv_pix_fmt_bps_avi, avctx->bits_per_coded_sample); diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 8a49234bcd..6ce8d7b964 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -55,7 +55,6 @@ #include "version.h" #include #include -#include #include #include #if CONFIG_ICONV @@ -464,17 +463,6 @@ int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, return 0; } -enum AVPixelFormat avpriv_find_pix_fmt(const PixelFormatTag *tags, - unsigned int fourcc) -{ - while (tags->pix_fmt >= 0) { - if (tags->fourcc == fourcc) - return tags->pix_fmt; - tags++; - } - return AV_PIX_FMT_NONE; -} - #if FF_API_CODEC_GET_SET MAKE_ACCESSORS(AVCodecContext, codec, AVRational, pkt_timebase) MAKE_ACCESSORS(AVCodecContext, codec, const AVCodecDescriptor *, codec_descriptor)