From patchwork Mon Oct 18 21:32:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chad Fraleigh X-Patchwork-Id: 31146 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp3749891ioa; Mon, 18 Oct 2021 14:32:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwbD4JPCr3M7xgp8HvbyMRUCw4RQrrMJ+k8/6UQHNQYa+R8bAOlXa/vsD667Ilo2AfGRQzp X-Received: by 2002:a17:906:2294:: with SMTP id p20mr34175364eja.224.1634592739404; Mon, 18 Oct 2021 14:32:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634592739; cv=none; d=google.com; s=arc-20160816; b=sz6inVGp/nzHaH9jTTDypB+mbDVzz+S1Rqv/uYCqwnX9V7xTTzTTwkOS4mdInpTYFT 2f3SZb0n8RASQkB5YSsh6atRYCt3+9gFkqO8VyQqzdBNVXMKaXvVhZGCwCvn/JhsYqgD j4oNTXEq9KhOasQy0Jag4AOyly97K2jo+8cIiwE8hHLHsPu27fyOpDjdC7v/WI7VO0zJ UqyUF67+PO3O+URX2VefEukliSgwko+PsnZaYzurIwOiXpr0rvHOOv/QJPMUR78KGyxL AYYR3l4KEaqlmpIYeJLRZVu18dxy6FNZ0rm5JZ2RLBwvaF4wj0LsEn9LhT1w4SOkOShL mbjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-language:to:from:user-agent:mime-version :date:message-id:dkim-signature:delivered-to; bh=DNAO6hBki4TRALG9Y1PLbP33KHcrESksBn3kC7Ow2nw=; b=Txq9oJW4DN/r1nCH88UKaVdBhYt7suEz7cNND2/wolDijlRUrzx5Q4DXxRRPiJO2NY nqeet4x0sWD2mhRISLOar+B2v6lFmb+Qw34UCDGnIctfryOUPZTtBinz9ld9+qstYxNv gSppt6+KqzTchGhGjgfGMFVjq2C0R/kyoUb6zumOTmY8WF1384lmmWax6wXc2FWnZuwU WwN+Fs4ywBxmcQn1nZ5vbVkzhlC+9PeiJ24dqS6V4T6PtUdw205TMMaTkrvcrxKnFrJs fO3pGI3VeaiCDLtpyaJPZWn3bwTD+vf4TTxpEBIpJV2hIR1oTZ12ghvL0T486cNHnuuN W8Sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@triularity-org.20210112.gappssmtp.com header.s=20210112 header.b="npm80ka/"; 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 di19si11578036ejc.27.2021.10.18.14.32.18; Mon, 18 Oct 2021 14:32:19 -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=@triularity-org.20210112.gappssmtp.com header.s=20210112 header.b="npm80ka/"; 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 4EA6168A67E; Tue, 19 Oct 2021 00:32:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 94C63688113 for ; Tue, 19 Oct 2021 00:32:07 +0300 (EEST) Received: by mail-pf1-f181.google.com with SMTP id v8so11645549pfu.11 for ; Mon, 18 Oct 2021 14:32:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=triularity-org.20210112.gappssmtp.com; s=20210112; h=message-id:date:mime-version:user-agent:from:subject:to :content-language:content-transfer-encoding; bh=Q/h/qrzBy4wKhiOV+vvdCQfccGbrxokbnk5zn2f77a0=; b=npm80ka/NzX4irG3hdyNRlt17j9aqEU2Qaq3DwwYiRaJ+65KCMi+8wx48N5x1Qy3pA PEjF2v18bqSBzwKH/DmAGQqIejiT2CeHo9yQjdVgNgXVZ42jx2nFgUZXaieHpLY9305q pfGHVcV73SHG2CN1npdrlTNDFHyaFsFCCDX+mHdbW44RU/kTdGn38yfMRTmQf1pNgK4Y Z7+jDP5F6+VsJu/TQsdYwf0I4tDdCz5YHzqWiu/qyvgaObL4KcMihonE5FRQbBp+BFUW de7kY2TfQ5rWKUFta7pCsgRGSlkh0DOlj4x1z0dW4ZjC5T0/ju2Ur2O/X81SY4KmWh6n K6KA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:from :subject:to:content-language:content-transfer-encoding; bh=Q/h/qrzBy4wKhiOV+vvdCQfccGbrxokbnk5zn2f77a0=; b=qr6hZCIy2Vqg4WnSKWgCGd/FTT4N5t99vi3y73YPiTF05PJlDSlabX4AKhARWpSwQB hhSVXU734TeXBDXuh/8eJRrikKVvfSFmvWCQPWJdziMsToNRvZHYb4xe22LJMMPcRW2s w38N8GW0V3drqWG7GM6ftxK/9eYgn9uotdCGCdGrfzgZOkU0qhKGqzUc7Zg3G/BbsTKm 5x1PviOf3m5+FtYLRlWMbvvX7oVEflrmuatVdaBW68CO4IvhqLp0ML+Y0sZpC3GBDslL uvYZMVl3US5Oup5KUCbcUtbL12ivWZL3PPrQzEqO0OPVglY5GAsECihiyeHirflHyhgE 6TdA== X-Gm-Message-State: AOAM530ISG0IvzLQmgt3Lop/nKcjSmThxB1p7oJw1/Uk9Tsa7VpuH1dC mUaWFiSBPNO1/kp/B0mZSpXv675wNjlBJ3vQPPA= X-Received: by 2002:a05:6a00:13a5:b0:44c:ae90:8603 with SMTP id t37-20020a056a0013a500b0044cae908603mr30902457pfg.17.1634592725672; Mon, 18 Oct 2021 14:32:05 -0700 (PDT) Received: from ?IPV6:2601:603:5000:f89:5947:de06:6c2c:d8c6? ([2601:603:5000:f89:5947:de06:6c2c:d8c6]) by smtp.gmail.com with ESMTPSA id q16sm6116049pfu.36.2021.10.18.14.32.04 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 18 Oct 2021 14:32:05 -0700 (PDT) Message-ID: <47446a10-f735-b9a7-8d7a-732ff707900d@triularity.org> Date: Mon, 18 Oct 2021 14:32:04 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 From: Chad Fraleigh To: ffmpeg-devel@ffmpeg.org Content-Language: en-US Subject: [FFmpeg-devel] [PATCH 3/6] libavcodec/: constify values from av_dict_get(). 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qRLi29FRn/zx Treat values returned from av_dict_get() as const, since they are internal to AVDictionary. Signed-off-by: Chad Fraleigh --- libavcodec/libaomenc.c | 2 +- libavcodec/libvpxenc.c | 4 ++-- libavcodec/libx264.c | 2 +- libavcodec/libx265.c | 2 +- libavcodec/mjpegdec.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 800fda0591..85e8fc0f0b 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -882,7 +882,7 @@ static av_cold int aom_init(AVCodecContext *avctx, #if AOM_ENCODER_ABI_VERSION >= 23 { - AVDictionaryEntry *en = NULL; + const AVDictionaryEntry *en = NULL; while ((en = av_dict_get(ctx->aom_params, "", en, AV_DICT_IGNORE_SUFFIX))) { int ret = aom_codec_set_option(&ctx->encoder, en->key, en->value); diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 10e5a22fa9..ea92eb6221 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -910,7 +910,7 @@ static av_cold int vpx_init(AVCodecContext *avctx, vpx_codec_caps_t codec_caps = vpx_codec_get_caps(iface); vpx_svc_extra_cfg_t svc_params; #endif - AVDictionaryEntry* en = NULL; + const AVDictionaryEntry* en = NULL; ctx->discard_hdr10_plus = 1; av_log(avctx, AV_LOG_INFO, "%s\n", vpx_codec_version_str()); @@ -1671,7 +1671,7 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket *pkt, if (frame->pict_type == AV_PICTURE_TYPE_I) flags |= VPX_EFLAG_FORCE_KF; if (frame->metadata) { - AVDictionaryEntry* en = av_dict_get(frame->metadata, "vp8-flags", NULL, 0); + const AVDictionaryEntry* en = av_dict_get(frame->metadata, "vp8-flags", NULL, 0); if (en) { flags |= strtoul(en->value, NULL, 10); } diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 0f886713e3..e255432604 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -901,7 +901,7 @@ static av_cold int X264_init(AVCodecContext *avctx) #endif { - AVDictionaryEntry *en = NULL; + const AVDictionaryEntry *en = NULL; while (en = av_dict_get(x4->x264_params, "", en, AV_DICT_IGNORE_SUFFIX)) { if ((ret = x264_param_parse(&x4->params, en->key, en->value)) < 0) { av_log(avctx, AV_LOG_WARNING, diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 7dd70a3450..ec50b8a77f 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -363,7 +363,7 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) } { - AVDictionaryEntry *en = NULL; + const AVDictionaryEntry *en = NULL; while ((en = av_dict_get(ctx->x265_opts, "", en, AV_DICT_IGNORE_SUFFIX))) { int parse_ret = ctx->api->param_parse(ctx->params, en->key, en->value); diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 7f89641660..b22895cfe6 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2407,7 +2407,7 @@ int ff_mjpeg_receive_frame(AVCodecContext *avctx, AVFrame *frame) int i, index; int ret = 0; int is16bit; - AVDictionaryEntry *e = NULL; + const AVDictionaryEntry *e = NULL; s->force_pal8 = 0;