From patchwork Thu Sep 10 21:49:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22270 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 AC3F544B5C8 for ; Fri, 11 Sep 2020 00:52:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E43668BA23; Fri, 11 Sep 2020 00:52:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BDF2868BA20 for ; Fri, 11 Sep 2020 00:52:33 +0300 (EEST) Received: by mail-wm1-f50.google.com with SMTP id a9so2290044wmm.2 for ; Thu, 10 Sep 2020 14:52:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ys/zMeaNfK/0bW5/yFvVqlXEpByrqYfK/TZQ5QaaWC0=; b=GNGybjQ4G49vFgRDh1wQsSkxeFzmFj7ikZJ9C/cmtO4wkxuBbHobRm6cXmrkelItDj Sbab6HNPYDTlIzjV2jTqr0/HBF5SFCrkT+7VfG/h/8AszicUj3hYF0k1KNDuSqUSqYyX LiOEGwl3Uyh/OwGrz6Z1DPVrvZe5F+XC7GGUdocImk4EoLj+CD/7mr5Zyj0vOlRxHyvz ozP60Xax+AfPEhlRp2oDG94RuNnWyAeTMLvh8VnbtdfT/PM/Hy11iW+wGNZB6bFacSVA n/hzaIxpCvwvF9CVAaBVYXv1yjFeg2TzhIFqxU01DJ4pGKBFC63/vVjrs35UXbUVnJwV GA6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ys/zMeaNfK/0bW5/yFvVqlXEpByrqYfK/TZQ5QaaWC0=; b=ctKLtogpQ8ni7W2UCu9UPp7LsfNqFtUSJT/0DIGxBeYCVmhlAOyff0XCFzgjeBK2uP EHYrwjEVsucUtGQzFzE3TYEENynXQKjP4U9cbrckbhHH/mCFhEkaaZL4zsU4PWEECUoc 975eunjXt9Tc+HyZT0M+K3IgheUx7BcLJN7XbuuY3M3aSg24ipKcZhVFX6HUJ+TBLW5x sTnUacqQqJ7Uko0b0/DRS+UItx4DDKtmBk+rsSPifBzSeV3AFQEYV4Aqaz9aVOqalevi 2PuBMpKlxD8Q6i0uj75S/RJT4glaylwjDK2rji4M/eWuEqS5FFwIDRFJTI8Tw0X/esTm +1Lg== X-Gm-Message-State: AOAM532U58+z1skylV+FmcKzhAI2WiPpk3JUgStN4EOZ0M2O8lEELXSd fSXFDNMVRAL10wPJtO8/5Cr4vVetssY= X-Google-Smtp-Source: ABdhPJw0M0e2/cd5qwPH8JUKmXz+Gv/cYIjs+QQVtLzEyaNOvju7tfYGgZAXcjasL+ZuoLTQV6X5Nw== X-Received: by 2002:a05:600c:2183:: with SMTP id e3mr2153938wme.49.1599774752452; Thu, 10 Sep 2020 14:52:32 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id z203sm59232wmc.31.2020.09.10.14.52.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 14:52:31 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Sep 2020 23:49:01 +0200 Message-Id: <20200910214901.25401-9-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200910214901.25401-1-andreas.rheinhardt@gmail.com> References: <20200910214901.25401-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 9/9] fftools, libavcodec, libavfilter: Add const to some AVCodec * 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The user has no business modifying the underlying AVCodec. Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg.h | 5 +++-- fftools/ffmpeg_filter.c | 5 +++-- libavcodec/avrndec.c | 2 +- libavcodec/utils.c | 4 ++-- libavfilter/lavfutils.c | 2 +- libavfilter/src_movie.c | 2 +- libavfilter/vf_mcdeint.c | 2 +- libavfilter/vf_subtitles.c | 2 +- libavfilter/vf_uspp.c | 2 +- 9 files changed, 14 insertions(+), 12 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 908bc73fca..8665218dcf 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -638,8 +638,9 @@ void assert_avoptions(AVDictionary *m); int guess_input_channel_layout(InputStream *ist); -enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodecContext *avctx, AVCodec *codec, enum AVPixelFormat target); -void choose_sample_fmt(AVStream *st, AVCodec *codec); +enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodecContext *avctx, + const AVCodec *codec, enum AVPixelFormat target); +void choose_sample_fmt(AVStream *st, const AVCodec *codec); int configure_filtergraph(FilterGraph *fg); int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out); diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 3c507f8c1d..e9e31e043e 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -60,7 +60,8 @@ static const enum AVPixelFormat *get_compliance_unofficial_pix_fmts(enum AVCodec } } -enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodecContext *enc_ctx, AVCodec *codec, enum AVPixelFormat target) +enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodecContext *enc_ctx, + const AVCodec *codec, enum AVPixelFormat target) { if (codec && codec->pix_fmts) { const enum AVPixelFormat *p = codec->pix_fmts; @@ -90,7 +91,7 @@ enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodecContext *enc_ctx, AVCod return target; } -void choose_sample_fmt(AVStream *st, AVCodec *codec) +void choose_sample_fmt(AVStream *st, const AVCodec *codec) { if (codec && codec->sample_fmts) { const enum AVSampleFormat *p = codec->sample_fmts; diff --git a/libavcodec/avrndec.c b/libavcodec/avrndec.c index a7bdab280d..f4ec490de5 100644 --- a/libavcodec/avrndec.c +++ b/libavcodec/avrndec.c @@ -46,7 +46,7 @@ static av_cold int init(AVCodecContext *avctx) } if(a->is_mjpeg) { - AVCodec *codec = avcodec_find_decoder(AV_CODEC_ID_MJPEG); + const AVCodec *codec = avcodec_find_decoder(AV_CODEC_ID_MJPEG); AVDictionary *thread_opt = NULL; if (!codec) { av_log(avctx, AV_LOG_ERROR, "MJPEG codec not found\n"); diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 2e5185f364..d93a0953fa 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -695,7 +695,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code if ((avctx->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) && avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { const char *codec_string = av_codec_is_encoder(codec) ? "encoder" : "decoder"; - AVCodec *codec2; + const AVCodec *codec2; av_log(avctx, AV_LOG_ERROR, "The %s '%s' is experimental but experimental codecs are not enabled, " "add '-strict %d' if you want to use it.\n", @@ -1193,7 +1193,7 @@ FF_ENABLE_DEPRECATION_WARNINGS const char *avcodec_get_name(enum AVCodecID id) { const AVCodecDescriptor *cd; - AVCodec *codec; + const AVCodec *codec; if (id == AV_CODEC_ID_NONE) return "none"; diff --git a/libavfilter/lavfutils.c b/libavfilter/lavfutils.c index 57af5ebfdc..a2085ed5ef 100644 --- a/libavfilter/lavfutils.c +++ b/libavfilter/lavfutils.c @@ -27,7 +27,7 @@ int ff_load_image(uint8_t *data[4], int linesize[4], { AVInputFormat *iformat = NULL; AVFormatContext *format_ctx = NULL; - AVCodec *codec; + const AVCodec *codec; AVCodecContext *codec_ctx = NULL; AVCodecParameters *par; AVFrame *frame = NULL; diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index d83cb6d1e4..ab12c34f4a 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -155,7 +155,7 @@ static AVStream *find_stream(void *log, AVFormatContext *avf, const char *spec) static int open_stream(AVFilterContext *ctx, MovieStream *st) { - AVCodec *codec; + const AVCodec *codec; int ret; codec = avcodec_find_decoder(st->st->codecpar->codec_id); diff --git a/libavfilter/vf_mcdeint.c b/libavfilter/vf_mcdeint.c index 9cdec6308d..bc7b3230d3 100644 --- a/libavfilter/vf_mcdeint.c +++ b/libavfilter/vf_mcdeint.c @@ -102,7 +102,7 @@ static int config_props(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; MCDeintContext *mcdeint = ctx->priv; - AVCodec *enc; + const AVCodec *enc; AVCodecContext *enc_ctx; AVDictionary *opts = NULL; int ret; diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c index f9733c3935..f53aa063d2 100644 --- a/libavfilter/vf_subtitles.c +++ b/libavfilter/vf_subtitles.c @@ -302,7 +302,7 @@ static av_cold int init_subtitles(AVFilterContext *ctx) AVDictionary *codec_opts = NULL; AVFormatContext *fmt = NULL; AVCodecContext *dec_ctx = NULL; - AVCodec *dec = NULL; + const AVCodec *dec; const AVCodecDescriptor *dec_desc; AVStream *st; AVPacket pkt; diff --git a/libavfilter/vf_uspp.c b/libavfilter/vf_uspp.c index 72a0f562af..6a814350e8 100644 --- a/libavfilter/vf_uspp.c +++ b/libavfilter/vf_uspp.c @@ -316,7 +316,7 @@ static int config_input(AVFilterLink *inlink) const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); int i; - AVCodec *enc = avcodec_find_encoder(AV_CODEC_ID_SNOW); + const AVCodec *enc = avcodec_find_encoder(AV_CODEC_ID_SNOW); if (!enc) { av_log(ctx, AV_LOG_ERROR, "SNOW encoder not found.\n"); return AVERROR(EINVAL);