From patchwork Mon Oct 18 22:27:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chad Fraleigh X-Patchwork-Id: 31156 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp3791635ioa; Mon, 18 Oct 2021 15:27:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzMMCU08hZ6oK6cAHa4fLvjl34IP+00NxMliVMe1o1DfV76YRl7PY0yosIFyrHY5GKkbdCA X-Received: by 2002:a05:6402:40d3:: with SMTP id z19mr48793010edb.393.1634596061634; Mon, 18 Oct 2021 15:27:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634596061; cv=none; d=google.com; s=arc-20160816; b=XHShWQ1YMyKRiNZ67nif9s4sKPoNREc193XGXB++CN1CzYQLeb3AjdKkIrd7oOVpFU Tj+NDsxf4bq3n4NCXhWFrQYtYo6kCCvXUDBte2BCRjzKMelyuCgBzIdYJDo1hUUA/AQN weOSf0KQaTZGMWNb5t22Atu190RrWoLjQTQgffVXxRB301OGEc6U3SPEtIhCTOCs93Mi A577qOBSuRLBBkV5D4jWsrHNYqCyGC+i4F9IiLYS10Ehrlz9TDYiP1pADQ6tnmbYLUkU ebchnpTN6Jo0mmhWcGRkItkTRrb1KSVa2X7i61Hl4LR2/usyohzuYOVk7F4F3MvqllTr 84Hw== 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=xVNoTnJXm4n/XFmb/qdJcW8ttvoj+14QOkxy++I2XEc=; b=w+NZrO8u5mamqYWs1vf+zPlLI75gvoloqd8WG2z5OSzxlk4QBYk6t2kfzDj42JKXvl 8jlu82nwRD7dU70uc4Xk313shLXpf1rGNv1JZ3u0xSTqJf8PE4VGve4uAgJYjtsOX9r6 adF4xYhe4m37GwiamDf8bIX1hyD1KiqWuGLdKQBsK5XUG0c7iXtZJr2M8QZiABj1HC4W A1q6LEgdnjQEivSRfLEK08RQoZ7TkRsPFlPslfyYCs8pcU1tEyErgvHxLyNZKXcWi/Wd raSlZ0/JuVioVzTpJsnzGOeI7Xnu16TNtREtq6pILd+faxwSZ19k41z6RmAtXgQ5eH8h MWAw== 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="Im/XuJfs"; 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 i20si18804182edx.16.2021.10.18.15.27.39; Mon, 18 Oct 2021 15:27:41 -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="Im/XuJfs"; 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 69C9568A786; Tue, 19 Oct 2021 01:27:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 55EAA68924E for ; Tue, 19 Oct 2021 01:27:11 +0300 (EEST) Received: by mail-pj1-f42.google.com with SMTP id na16-20020a17090b4c1000b0019f5bb661f9so1142742pjb.0 for ; Mon, 18 Oct 2021 15:27:11 -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=7OJL6wrkfeXg1Wt9cdEajN2SP6Mt2ic5kZr4V+CgP+w=; b=Im/XuJfsQG21k/wyPHlUTGKFVEPpKtKa/WYo0YYRbLyOaqELEpLZlaSQ1Rqbla2MqE RdLqCD0VvVoGNYGhQttgQBWSbTy6IlEGxZiXsZzjxaQ0LvHdO90QPGMpXB0YfqYZosLe Hme5Y3tJ/mkNnzccFBOMPi4J3JxZhEsg1eLEg/y9OmGo+3+orX+hDwoaUm8BALZmhS4e LaNVxeb2t0ncH7WLA8sRfyhIl390rswa5wBT+2CNHcK3WjJam0TXYYWLPhuwnv1qEGj1 mvttSQnh/dEIJyF9f5UbFU3trKIHugUFlff1d6fnr+5wfR5DUpWZY7vp2IuwIb4FMe6U j/YQ== 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=7OJL6wrkfeXg1Wt9cdEajN2SP6Mt2ic5kZr4V+CgP+w=; b=E1QDd8c78IfBUgc0EdnoAeoQRSx2uktwBV55D8JONCJbJoBCtYN2JNnjqfpqowIPcN ILqpJXpGVgtT/WrdC05YwsMlk+ryMWRaxwGZP0J366ikEu44qb96wHWYasiwhL0dkGOP jJihtAJDjlW+zFCK5DO1QSpNdqjqUkwNjSdOWv4/V9ohpgoz7PR+xcNIjF3tgIrVQhXp wK2hWH9pvHW+qsqYnfXf/Vaqlare5SI8vedCOJM2R4++rDzv2wUzYfVte9A7W2cVCnyu UpYrDbPTtrQIBg40rvW343WDq6n49qXWdp+tCHAQztDBovs+t9QKJehMEHPQXKE33dnN Reew== X-Gm-Message-State: AOAM531FTJ4AjUfc1CiF3iYvKYfqKzZw1VnAnYpptL1CmgOJ7foDPDKe FNYe0s2gMe9bktXhYXsJGEHOy6d/W5aMhlUscfw= X-Received: by 2002:a17:90a:a586:: with SMTP id b6mr1899816pjq.244.1634596029589; Mon, 18 Oct 2021 15:27:09 -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 m7sm14046177pgn.32.2021.10.18.15.27.08 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 18 Oct 2021 15:27:09 -0700 (PDT) Message-ID: <20e1fea7-f67c-e581-687a-28b4a749485f@triularity.org> Date: Mon, 18 Oct 2021 15:27:08 -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: 5hp0WpeMQZqW 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 507fee39f2..0251842bd4 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -931,7 +931,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;