From patchwork Wed Dec 1 16:55:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31882 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a0c:cdc3:0:0:0:0:0 with SMTP id a3csp1656587qvn; Wed, 1 Dec 2021 08:56:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJxFuXMPACzQ3BCEfz5rQrhtpz5pYOm5blxO/HFV0fvjTqwMKf4lHbuPTgkA9cz3i5bzMm1v X-Received: by 2002:a17:907:2da1:: with SMTP id gt33mr8486532ejc.378.1638377775883; Wed, 01 Dec 2021 08:56:15 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id de36si369331ejc.172.2021.12.01.08.56.15; Wed, 01 Dec 2021 08:56:15 -0800 (PST) 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=l5ZoOhtW; 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 BF90468ACF8; Wed, 1 Dec 2021 18:56:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074024.outbound.protection.outlook.com [40.92.74.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7368668ACF8 for ; Wed, 1 Dec 2021 18:56:06 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F/khFmuWTQzxD3XzYLoa9YQYrsUFOIRcgecSG1gtcEOto5dCmCXTiUkc9X409CVDRac7Jh3y2F3I9487pQll3VZovTOFBylQxxq5TCDd5CzCRCAVbXPPEOhrqWEcLTex4M5HmxRPc8iodEnUZQU3OmzBkbtDlCkI7GYfOKyK8YjMXu8TiqUJ/gVjeC+xeklpbgVCX5k+mBLDa1spNS4ExvXbry4ocQhbH30WNt/y3lCegdchLtZsshukL0KW+8/P5ehbaA+FMmND4JPK5BsHb5Fr05W377droGbEPbAkPe0vjg6+d6NBK5009Kss/g/hDoR+96me4PK5aYMSWBF71w== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=JpaCyxeteZ86yAQuEYpIwFf2wIW7FNIugsvPN6sCh40=; b=atE3GjLb3UGJUKpJtsjR2Wm/cwKMyYT84z1s0WCvCL+tLyGp7fQc7fLdKG5dOb+9fj7xp+QNHG/sbPBcY9UBf2D1FENmxXGuI2EW2AV8i/sAUbddv8JXwGi6tZAI/WNV67NRSblZDVNKnQs7tTDjV83nLyIflP4YuWWnOc/JTkUN7uTxbmgCAVEKuL9CXsBngXz3wIY/n/kvjJHtwKRyLwyhafvL1KmjXIC87lWqJ66z8Ex2SIAaxrY8wPdSmQ6TEeAmDM2uoKdwkTly50o3EH4aG/XNfi96NFEPYiCXy8KOp++Rml82CSJ4gAnku2WuMtWoczDVZRr7ajQaIFZnPA== 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=JpaCyxeteZ86yAQuEYpIwFf2wIW7FNIugsvPN6sCh40=; b=l5ZoOhtWxm7esfJuPRDxpiZSS9fV/+VLQVhl4BaHDx+ykcmFArky7u5bW1U4IxvWwq/AoHU01X1nHlHwv2uFoaR0pqeFz5/wPKLmIFXaHhgxC270Dw1e4sj53d/4yQDX0ovWSi61LXMPYA96Wk5Sshn5O28Bs3RKvGnY7vYnt1qG8I4Bp7GtM8ggjyKiraI6U3PxI6oFIUBqRoYYox4iGSkOkOKciiVy4RnYNvGSdUGZ3w0J13Yj9emwmr6+/8eMxSuojQZuSDCJwtp+qYN0iRZQVlozwE0TBp9BYLiT9nEBWB159/TpUMHn6acr2Brj3K25pZqWqgMFjjipQyk4+Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB6022.eurprd03.prod.outlook.com (2603:10a6:20b:ef::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.20; Wed, 1 Dec 2021 16:56:05 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%9]) with mapi id 15.20.4734.027; Wed, 1 Dec 2021 16:56:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Dec 2021 17:55:54 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [F++YWtmiSyhXRIKA6fi/oUJg95tEfeDs] X-ClientProxiedBy: AM6PR08CA0026.eurprd08.prod.outlook.com (2603:10a6:20b:c0::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211201165557.282740-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM6PR08CA0026.eurprd08.prod.outlook.com (2603:10a6:20b:c0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11 via Frontend Transport; Wed, 1 Dec 2021 16:56:04 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 226504d8-f84e-47d9-7add-08d9b4eb7650 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRgLPy5mVQQUMAlQUPLmpkLvKC69UwpDoPnHyCLCBhiRQBODEHNDiTAPlOvHEAh6nPoM+iMVzf+rRCQgEPiuAHzvg8kIM4aDyV1tkudRuSVLbFJ/EQIfSeSqXpgQ4TrWdjo9qRqPuLwvPVN+aKVHTtPDNQAxIGVeuhM8FCChSnERV1QG72p5A/M+bOTXFSDEGS1qIomzhtYssk+bB+nQL3xSXW2TUa4Yx6OCHaRV1rhFHXHAi4tKP1yvOkms1dJ/DFBU3oyZG8aMhOH/u3/t3f1EAmiycVXmWh6H+bRNq+VXLoxSCAR2iccpgO9S4+ZVgZ0I//81SB7fIIuT2UEbQ/yXm5McCe5VIkPJifNH7kE9gqOVnHzq4Hj52yJswixAFjncWOLG4w0U1A3ojzdo3ONdHS+/rcH8HvZ7nl7I4qn/uaNiDRaI6t4FK9d1BOUUgVvhCHzOK5L7As5LIfB/VpobK8QX1NZIhWOX0UBglepIlaXsib5Onk9vqEvwtb56hCM0Bz4K3qjIYNZjs80c4ALkBi+WN32TW+XYeQkXofbkRLsr/cozGcv8Vy4xTdkTMdMbFH9b109MxZh8PnZp2+xvB6asfIfNz39wSP8bc8RFF/R05wJEkHH9T8g9FVw9p8V8lnD2P9rcUYQ6r1fiB+QvZmsi77hZmKeC4LdIIlPm04Wd0bqNKy8LIUvRKaQMYYSKx5H5t/WYx9dcOyQn9T4xp+UqzG93KQb1cat9AH2wSQB09aqHKDhuwi1Ep7/fo4= X-MS-TrafficTypeDiagnostic: AM6PR03MB6022: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hFuXBiIQOqp/sFrMryzrqOsdRORGwS2cxBG40gLshvcojh2TkB3lwgTL/wH1KIee7pRGatutSPVmFDYcXCx3CFlTr0mMirwgJX9pw0Fce5NtaCy0kxuCjFCmMYOmPU73+zB0QI4asqLBRa/dDs4Jb1zEpvWj1IigxS64WZUSwLcVltBQS1x1GjEsD+F7QyNL14sektSItXLJCrL4iA9rOxGETz6VM7Il1HgEP4uCrGlx6XsGNPTYGAumloGWJd1y0Rj+uzPjOnpoai3bf/xDHCkVf4VLpLNgY0XKMZ5VGkQRpsdIkUOKYfT9lI8s3/b5qoFl1BUvv+MqA1WUvEztjtwx5RqYCJxa2/yVUy7Q9fboNOu5w7la9y7MFejLf2IV8vfM1pXvaEU+r5oUQaYWtR1rUtuRht32o+dPMl4ZL0SuAHnl+ww6WSY8sRsNUtSwF7uyNq/2NzbX+SrdSvnvS6M//0VXkBIsuV1xa34KXyoUDp/15t49PAoLZWNLxkO8Ea8jR5eOrpqqFfsEZm53B3k2QIK7ydzfdctIkSWpyg4Xg3TfZUkQqLALSGGDZX5QQUDytVJdPKifmUq4uzGyXA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7QRpH/ToZlCn6JwRaAs9H6+RIj9bUv03U3a0sMkI9GGYL06s7341u8bhaYjG5ldi/LcuogU9qzC+ZRkF4HCGbzVnjJqxoYqn6IysEtbwwSyABodfCGPeSAafjg7n8NR7QqOPQy1sNODWHhv2hrQN2iag3Pyq67w6T9hi9lzyXTcDfPSp6Ag5WmjNoLhU0YqgxU02ID+1k8skSGkDsiw1huoYCg39J3kHy44H+u2ONMj6P9aFkp5DTmKqlQAaR3+rJplFZXefDql3oWV9jyxM/dQp8Ui0pip1tnl8W2fj0lCbZZ1nhaHl26sj/ahbrKfSYEyk3Zj33LJvzRKg7uyryzNPDCgeRSC5Pi+WJEyPCoV028fBjBdTmGBA+im4Ly6sG7nNvRinyc7mjiAwu3bJjbf//G4WkAPq7dWSagKw136xCgMOKX3u2X7ns/NSWAELdT3brPANl3gQ6VLC354BROFDN1w1Z/L6orqFrU2nJLpRoMy2S21nf+2kS5W+gEdtZuZKZvBPlwgeuCC+kTWpNSHa/sllE+BhVZshgrHTrAPvAzoPmz3oq5/M6lA30kz15smDMb1L4uqiaYBDs43Lob22QyC0qHkvftJXORZnLfzuEa4moBxuPDb82OoZxNc7H/lVha9Zn6kDx+sOGjIK5osAUJSBZMV8VajetQKW8xikIv28CPw5CNjXk+1YvfGfBnnPbjOtP4vJd29Xhq+hpT1R/+tuSguiCHv8JKq25EBHKPnVgh6jPFPBp8xAW0D+RU5SV0JMw7ezTErT+kwiAdvaq+o3K1VF7cCo7JgjjQp5Erh2wvq1GEoSj6tEmmDkHjUROGB+CyVVOZ4UMvdIoi+six4xqvJnZVo4kGYnyetrUgBBs+oPTqP5BIYE69zkybU87nzGkdFlR2rri5eeHFho88gOZ8Hza7EtFLUGUWBVZmCGdr3jRxbAgCL1hOIrZHWO40IQQyEUFF9oo8NENQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 226504d8-f84e-47d9-7add-08d9b4eb7650 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Dec 2021 16:56:04.9037 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB6022 Subject: [FFmpeg-devel] [PATCH 1/4] all: Remove unused-but-set variables 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: cFBpZS//91Q7 Content-Length: 9334 Newer versions of Clang detect this and emit warnings for it. Signed-off-by: Andreas Rheinhardt --- libavcodec/aaccoder.c | 3 +-- libavcodec/cinepakenc.c | 3 --- libavcodec/error_resilience.c | 3 --- libavcodec/imc.c | 5 ++--- libavcodec/j2kenc.c | 2 -- libavcodec/roqvideoenc.c | 2 -- libavfilter/af_astats.c | 4 ---- libswresample/tests/swresample.c | 8 -------- 8 files changed, 3 insertions(+), 27 deletions(-) diff --git a/libavcodec/aaccoder.c b/libavcodec/aaccoder.c index 11b0559e1c..7bbd4d5b2e 100644 --- a/libavcodec/aaccoder.c +++ b/libavcodec/aaccoder.c @@ -414,11 +414,10 @@ static void search_for_quantizers_fast(AVCodecContext *avctx, AACEncContext *s, start = 0; for (g = 0; g < sce->ics.num_swb; g++) { int nz = 0; - float uplim = 0.0f, energy = 0.0f; + float uplim = 0.0f; for (w2 = 0; w2 < sce->ics.group_len[w]; w2++) { FFPsyBand *band = &s->psy.ch[s->cur_channel].psy_bands[(w+w2)*16+g]; uplim += band->threshold; - energy += band->energy; if (band->energy <= band->threshold || band->threshold == 0.0f) { sce->zeroes[(w+w2)*16+g] = 1; continue; diff --git a/libavcodec/cinepakenc.c b/libavcodec/cinepakenc.c index edb553f0db..0574b125d7 100644 --- a/libavcodec/cinepakenc.c +++ b/libavcodec/cinepakenc.c @@ -705,7 +705,6 @@ static int quantize(CinepakEncContext *s, int h, uint8_t *data[4], int entry_size = s->pix_fmt == AV_PIX_FMT_RGB24 ? 6 : 4; int *codebook = v1mode ? info->v1_codebook : info->v4_codebook; int size = v1mode ? info->v1_size : info->v4_size; - int64_t total_error = 0; uint8_t vq_pict_buf[(MB_AREA * 3) / 2]; uint8_t *sub_data[4], *vq_data[4]; int sub_linesize[4], vq_linesize[4]; @@ -795,7 +794,6 @@ static int quantize(CinepakEncContext *s, int h, uint8_t *data[4], mb->v1_error = compute_mb_distortion(s, sub_data, sub_linesize, vq_data, vq_linesize); - total_error += mb->v1_error; } else { for (k = 0; k < 4; k++) mb->v4_vector[k] = s->codebook_closest[i + k]; @@ -805,7 +803,6 @@ static int quantize(CinepakEncContext *s, int h, uint8_t *data[4], mb->v4_error = compute_mb_distortion(s, sub_data, sub_linesize, vq_data, vq_linesize); - total_error += mb->v4_error; } i += v1mode ? 1 : 4; } diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index f13be7b918..91cd8a4444 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -476,8 +476,6 @@ static void guess_mv(ERContext *s) none_left = 1; changed = 1; for (pass = 0; (changed || pass < 2) && pass < 10; pass++) { - int score_sum = 0; - changed = 0; for (blocklist_index = 0; blocklist_index < blocklist_length; blocklist_index++) { const int mb_x = blocklist[blocklist_index][0]; @@ -668,7 +666,6 @@ skip_mean_and_median: best_pred = j; } } - score_sum += best_score; s->mv[0][0][0] = mv_predictor[best_pred][0]; s->mv[0][0][1] = mv_predictor[best_pred][1]; diff --git a/libavcodec/imc.c b/libavcodec/imc.c index cbe3edeeec..116c273ba0 100644 --- a/libavcodec/imc.c +++ b/libavcodec/imc.c @@ -829,7 +829,7 @@ static void imc_get_coeffs(AVCodecContext *avctx, static void imc_refine_bit_allocation(IMCContext *q, IMCChannel *chctx) { int i, j; - int bits, summer; + int summer; for (i = 0; i < BANDS; i++) { chctx->sumLenArr[i] = 0; @@ -853,7 +853,7 @@ static void imc_refine_bit_allocation(IMCContext *q, IMCChannel *chctx) } /* calculate bits left, bits needed and adjust bit allocation */ - bits = summer = 0; + summer = 0; for (i = 0; i < BANDS; i++) { if (chctx->bandFlagsBuf[i]) { @@ -863,7 +863,6 @@ static void imc_refine_bit_allocation(IMCContext *q, IMCChannel *chctx) chctx->CWlengthT[j] = 0; } } - bits += chctx->skipFlagBits[i]; summer -= chctx->skipFlagBits[i]; } } diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index fa6fc208f5..c06752f43a 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -1272,7 +1272,6 @@ static void makelayers(Jpeg2000EncoderContext *s, Jpeg2000Tile *tile) double min = DBL_MAX; double max = 0; double thresh; - int tile_disto = 0; Jpeg2000CodingStyle *codsty = &s->codsty; @@ -1294,7 +1293,6 @@ static void makelayers(Jpeg2000EncoderContext *s, Jpeg2000Tile *tile) int dr; double dd, drslope; - tile_disto += pass->disto; if (passno == 0) { dr = (int32_t)pass->rate; dd = pass->disto; diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c index 684dbe0af5..95012f7c1a 100644 --- a/libavcodec/roqvideoenc.c +++ b/libavcodec/roqvideoenc.c @@ -666,7 +666,6 @@ static void reconstruct_and_encode_image(RoqEncContext *enc, int i, j, k; int x, y; int subX, subY; - int dist=0; roq_qcell *qcell; CelEvaluation *eval; @@ -692,7 +691,6 @@ static void reconstruct_and_encode_image(RoqEncContext *enc, x = eval->sourceX; y = eval->sourceY; - dist += eval->eval_dist[eval->best_coding]; switch (eval->best_coding) { case RoQ_ID_MOT: diff --git a/libavfilter/af_astats.c b/libavfilter/af_astats.c index 0621d18b35..3955a4e8e9 100644 --- a/libavfilter/af_astats.c +++ b/libavfilter/af_astats.c @@ -403,7 +403,6 @@ static void set_metadata(AudioStatsContext *s, AVDictionary **metadata) max_sigma_x = 0, diff1_sum = 0, diff1_sum_x2 = 0, - sigma_x = 0, sigma_x2 = 0, noise_floor = 0, entropy = 0, @@ -428,7 +427,6 @@ static void set_metadata(AudioStatsContext *s, AVDictionary **metadata) diff1_sum_x2 += p->diff1_sum_x2; min_sigma_x2 = FFMIN(min_sigma_x2, p->min_sigma_x2); max_sigma_x2 = FFMAX(max_sigma_x2, p->max_sigma_x2); - sigma_x += p->sigma_x; sigma_x2 += p->sigma_x2; noise_floor = FFMAX(noise_floor, p->noise_floor); noise_floor_count += p->noise_floor_count; @@ -659,7 +657,6 @@ static void print_stats(AVFilterContext *ctx) max_sigma_x = 0, diff1_sum_x2 = 0, diff1_sum = 0, - sigma_x = 0, sigma_x2 = 0, noise_floor = 0, entropy = 0, @@ -684,7 +681,6 @@ static void print_stats(AVFilterContext *ctx) diff1_sum += p->diff1_sum; min_sigma_x2 = FFMIN(min_sigma_x2, p->min_sigma_x2); max_sigma_x2 = FFMAX(max_sigma_x2, p->max_sigma_x2); - sigma_x += p->sigma_x; sigma_x2 += p->sigma_x2; noise_floor = FFMAX(noise_floor, p->noise_floor); p->entropy = calc_entropy(s, p); diff --git a/libswresample/tests/swresample.c b/libswresample/tests/swresample.c index 53896585e2..14a8f14f3e 100644 --- a/libswresample/tests/swresample.c +++ b/libswresample/tests/swresample.c @@ -362,16 +362,12 @@ int main(int argc, char **argv){ for(ch=0; ch X-Patchwork-Id: 31867 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp9531582iob; Wed, 1 Dec 2021 09:03:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJyIf/H7o5a4pJ76O4buBGVEJ5qQpjegDylnVuAf6LAMBgUfe9fagvgUVCqkiO9jA6fUeY0n X-Received: by 2002:aa7:d048:: with SMTP id n8mr10094878edo.333.1638378215712; Wed, 01 Dec 2021 09:03:35 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ds9si287615ejc.479.2021.12.01.09.03.33; Wed, 01 Dec 2021 09:03:35 -0800 (PST) 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=hnH74Yq2; 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 C21BF68B010; Wed, 1 Dec 2021 19:03:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2092.outbound.protection.outlook.com [40.92.91.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 821C468B005 for ; Wed, 1 Dec 2021 19:03:24 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BtiHow+/Faq24155vHSIVt5WR6rYvBQevd8REaOYRTxiXpUx5zWfuDEHXkQH6BKImffuk+heFwrNzheGsoLCy6Z6ZUUz4g3ZOR+Nt8OEU5g0vKZK5topzfvIlWgPQdTB1AVP24Xbjgh3HseGdKSfWzQhfn5G8F4jHPpueYvvAK3hUFZIQtvQJBRkXvkNkfJ7UmFblHvwoRe/8Ehu+L/WQNVUCteL5581f/EqdCLJG/ximtxufeCNc2h9VmHI+68VnFQkzxaoW7x6D7KdrlMzpUCUyVWlwvv37kuqQr1LNo8O4MsLfjQYlzfwUJ2869XER32EGeF4HRD69uKuh52JQw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZhU9CX0zfJrCq7cfzYYrQcSc+VY1k0dyNWKgzjx3gjY=; b=aGxcPkD5T73fvB/8YFEwFdIy2r3CQHwlmh0VHSDlXVSDq1KkGn1/z7ZH5YQW9fVm1R4JBEqs4AwfkSX3FdBsidTqa1vR2jSGVHEKpvM+wl/HUakQCWU5hWyJmeUrQtPKQVo2wlHR//zNr1gKYBb3EiDh6aHj5PVFYRqEgbV1qWHi+uFyQe3Q5EH5gBBN9kDG/KvPP5/9uFNVLbdL2yTmBWPK6jNXNO2fvqsyqaPcCI3DWE77Q8dYTw1arIL6G3/mWu+mhdek+j6zkX4u+O0cDfeAMIA2tOCVkNg+CFvukCEWgLuZiPg2NnWlbEihv4qs/fIC60eG2T8viNB76W0XVw== 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=ZhU9CX0zfJrCq7cfzYYrQcSc+VY1k0dyNWKgzjx3gjY=; b=hnH74Yq2EdzfQDBlB8gERx1gAVCdEsMXaXuuIzrZm10PfLZjSjCQAMBcqqkdDurI+bfqaqF0TxOCow/p27LWPh/a8LDsE4guz3qUTvtfNlNoEOt+WC82rURljaVYFCOoH/509g6DKctNgqtdb0pb7lbV0duG+vApNoTTucFgUaXC5m0l67hNkVJcvUP4h7JPz/cM/iJSrYtVkY26UnbB2CjVk0P+wE2GwelcoYE9ypnzuG5muddKULk2o9fNiH/iqa3n4PAGtlQmDo900fN+0op6b8L3EJb0hS8Lskc1bDhS2m3/XqkxwdmGRnsnTxOrsomxGRfgazkO2QFp8hn3xg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7143.eurprd03.prod.outlook.com (2603:10a6:20b:23e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.14; Wed, 1 Dec 2021 17:03:23 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%9]) with mapi id 15.20.4734.027; Wed, 1 Dec 2021 17:03:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Dec 2021 18:03:12 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [UDTSaihng5KSNZPAeRg3Zyx7br19WuZX] X-ClientProxiedBy: AM4PR0501CA0047.eurprd05.prod.outlook.com (2603:10a6:200:68::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211201170314.285597-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM4PR0501CA0047.eurprd05.prod.outlook.com (2603:10a6:200:68::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23 via Frontend Transport; Wed, 1 Dec 2021 17:03:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3d25db4f-4c6b-4f16-d595-08d9b4ec7b7b X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRgLPy5mVQQUMAlQUPLmpkLUxZa12C0FMdaE4hxQPIWuKAS1zZ4J9te4nO2tMxQrAfsLrl1TLsn796NtLdbkI9qQBpdp4zgiMlFAP10Hnwgs9TWRpVhtfHr3W79pEt46yGk1TY0KL7Nu8U3iHa5d3/WgRa2yd4Uig2uLCuwg3u/2E7mS8w+PdZ1v9fUftAzDEKJmRpWbZ5cx6WQnMKiGmbWhE8wk2GeL9TYS47xxqRfJkYr+7S6Oij84smMiaaItY/gvgQKiIh57xCqL39y4xTI9g/wf3bL99RkWhz4qZ2mH5cW+SihjjiU8nj5wSUvbWkCkY5OeXrhWTIPmXL4fzH/2wXfarM3FYR+S/tIyaeXWEpuCcUF2DDYdwnfkk1kEDQhe/8GW/Q5yFBqL9OxJmAyanx/+CB9a2jsu0lZwRcoD0Cv40ui1ixwo2Y9SutpgAKXed0Xq839kmSknRe6B1dYfvRFQHEJlL6NH7U5aoHSqN58BRlRHeFVO95WVNSqOSDIvsBSQBQTH3kyZSDA/6Q/w9DC9M44f1Wvx5q3H/W5/xppNaVwbdfwEQdOCBk7dcfxyoaCgKkkH4pj2ckSJsKgNhRh8sFUnG2K0vezv8Y1hOaotXy0mji/HG3zR+H9XjE13Yvl4T4qF+CPrTGjdOdbtvWqv47BbPrFVr1k100rU7vgFWRsc/3q7gdVnhalSiosuxC9oiWfMzAWmvMetOg+TnxnwFV6+wJVtiiPo8+rdedfWI2SGG7XQtswG52TGyI= X-MS-TrafficTypeDiagnostic: AS8PR03MB7143: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: i3TFpBoxYdoCsXtsJrqGdGQ5TNgPsFC/pDWFf1Xr3X2XZIuVD8nx+yXoBDV2qqvnG4bSY1hPe3g+r59UD2oYe/BSjz02+xkL9qkFXPjZmBifdA1eUZm1Jb+zzjnJO5GdxudbV+fQv7xEReUYxQhUerMzNSPHitmoeYUni8oxOPLkv2Bm6jKFRqxEHP5S5Vblyd0mQyyBeTfsoBV5X0RfPpQmbAyGIfuvxv9fg8rrC9fFwbrRFRG2wdRE40a4sYI+heOKlyu6tkXpN2mEim2Itenpb02hv47zl8gYlaG302+jUP+8S0dxTojMF4ylaY4+AAnX/E+BuaFVrhpIiyOm8RKBmhLHKklxSWFNAsZSCK4LO5ViR6Ka9G9E+vSAZ6O9ZXHvoG6/rN4DbSb9VEQV2+3LTFPupNKreGNHsP5+FjoABbIsf943El54zLjoimsqqSHdoAIdYJFZy3XFj/WHd9jVlTBUJx5QLYwXgAwAZp+VfkSEInCLN7lWBYbly2opZG/aTAuFTQ/7maoOy2oJwMzUSLWoisQtClJxgCYeo9WNQNow9rzcSksJUmFfLHzonqBa6tURmw6s3oer8hDODA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HVsGmimf3ASL6FQFgDW9JeqAa2tJXBNxnLddVE2dYy0++GgtNnuoo5vOuUj8IaUSoZg2uqCmb3WNlYntHOwJ7z8Rvw76t2AAVXdvjX5m13GahWT2oC5CTr3tDsyY7CCltFz2q6mylOCy6SL+Vvz0X0jT8VIZgOFWNNXaTE5MUfFEuVuFFa2hYj13u/0WQq4uk08FF7I5Vnp94ke2QW4dKUGix39OFB3WF0kHDqpL4N/345Ez/H8tGqQxc+wg3Em9CHQst1ppfgQT0ZfoM9srZ6zNV7CQvondKt5KqJIZEJcDIP+Fptws+yl4zdOzX6U9Nk1dFgcqfSDJTkz0ZOdv63IxTG9XyNlDZ2U786JupI5n0j6mk5QBd+sLIH8Mkl6WBBb25IueYRBo479oXKJcsrLbcMwcEZPZzJYUWdhkf1huRYlSE13no6hwiAvcPK1C6xKckk+iM9uV6fQwbq2RcJnzUM0vhnLYMTOzHJzhpAYQy0wpnINKWwCZafOUnzwed7kY/qJB/v6QRfZ1GRfukLX6vG+s7Nw55bSD2oBhML7OjEoBnkE3aqvbIUuo/cCzCFJS30nAgmNTAkYrq6wQaiJhXvtQrdsy5ntIEKI6F+x4Smkwa+U/jblI37EGCSkibkq4SquKKjVoze21cVuMCDZm3swU+cqYY9WFfT+WrHxqGtjxUGVcqwxThNJ0+Rd2PpczMr7G1PVP+JDISsMV5hJ+KrzU3SIzzQPBWlsn9KViduAuARqbs4WH3jYF7ezM7p6u8I0P14Iwsmt2gmpsMSLINqgbXsxpcaw8J/ty2OZr7DqYGgT6YJdj4w1IBezDzcccAamlux+upWR7Xj12DIbZpjALWaRsdTyAgKzK/mLWs7k1rI6yg7IwOlnjh9/FwXCP4Rj/6mX2RlA3AA1/vusNmCIAAYAyfbUoHsL8mkx2WL6Tv+QfagjPTKDTnHkHCW9GksUSpruE9/iQquaqpg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d25db4f-4c6b-4f16-d595-08d9b4ec7b7b X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Dec 2021 17:03:22.9268 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB7143 Subject: [FFmpeg-devel] [PATCH 2/4] swscale/yuv2rgb: Silence a set-but-unused-variable warning 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: 5gDWyyJJghm5 Signed-off-by: Andreas Rheinhardt --- libswscale/yuv2rgb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c index 353de2f822..76232cb364 100644 --- a/libswscale/yuv2rgb.c +++ b/libswscale/yuv2rgb.c @@ -145,8 +145,8 @@ const int *sws_getCoefficients(int colorspace) dst_type av_unused *r, *g, *b; \ const uint8_t *py_1 = src[0] + y * srcStride[0]; \ const uint8_t *py_2 = py_1 + srcStride[0]; \ - const uint8_t *pu = src[1] + (y >> 1) * srcStride[1]; \ - const uint8_t *pv = src[2] + (y >> 1) * srcStride[2]; \ + const uint8_t av_unused *pu = src[1] + (y >> 1) * srcStride[1]; \ + const uint8_t av_unused *pv = src[2] + (y >> 1) * srcStride[2]; \ const uint8_t av_unused *pa_1, *pa_2; \ unsigned int h_size = c->dstW >> 3; \ if (alpha) { \ From patchwork Wed Dec 1 17:03:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31885 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a0c:cdc3:0:0:0:0:0 with SMTP id a3csp1666431qvn; Wed, 1 Dec 2021 09:03:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJxXMJq0dudbfMLRs10n0b6VB0e2LE+u2yuEqFygoWUp47EJ9iXzX5TCap7CxrSR7gHcImwc X-Received: by 2002:a1c:ac46:: with SMTP id v67mr8532481wme.182.1638378229976; Wed, 01 Dec 2021 09:03:49 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i24si422867edr.262.2021.12.01.09.03.49; Wed, 01 Dec 2021 09:03:49 -0800 (PST) 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=TuWivHXB; 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 126E768B026; Wed, 1 Dec 2021 19:03:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072085.outbound.protection.outlook.com [40.92.72.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3225768B01B for ; Wed, 1 Dec 2021 19:03:39 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eWpr6GgBGT/WxDOfT9PjKKogzn9HjJTIB4SJRmLSxv7TsDUQ9I5ho6SsN6u9pgwiH4kUizj/kH2BkR/MkU9zUitTxlSBaoRAiL9W0diEtbQlHn7EiMNQ/fOx2hOJwMhelTEi7muG7e0MM7GHMmI0g/BXB+gsLavtI6a9KzqTIkVkllt9VwQbz1Se/ySfKxKrfuvRPoknrtPEIwXbA6FeqXpcWQYWTDF3GgAEisYRjDDRjL5uK8cu3rWWAQqG5hU9sxnpS78k6pwOXb9zRbTv8InqAS+CNz/LQaU5JtVOFdbCCzAuJhJUNrdHdpbkrZfz6wuUTPdxRwR95T86twBWuA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=UtEYC4PXxhEWB0MIuf6blcg/3pwa1pMqGNufD+8Ka64=; b=airP/9UnKrCgD+fRwn/5C5zqKf32MUABqSzy3i/v1F/dKRNo7zZcSiwolY3c9nj3Im62K34aSnhb7z0CK4PRVgq8//jmEV5qQsaimdNAIZGqi6QEO9nzotwX9R4cLdnak6Ogut5mvRtvD1TwQyF9Jq1eayYdV9ElsC7tKmRictHQl9xtxK45ii7s82xO8gqF9+fYY6nlo7LYAv1b+uRxH/VVGE1jOZQzHv2KcKEr0uq79yVG8u1FvWDBH6asg3tpbO4hxv72+aXe3tfRXqZ8DM6b7bl5u0sS7yBQvAOOBdCuWX2L3WphceGOmuzgbKG6VvkrV0faVGd0l+Y1K0x+BQ== 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=UtEYC4PXxhEWB0MIuf6blcg/3pwa1pMqGNufD+8Ka64=; b=TuWivHXB9i92ZrL0c8y9NyT22g6OCYMrLUzSl0JOEdppqd6OPwvw+Kjek0rl3X6xdvNcehuJnW2YoVASxgxKQy3GsHI0hMdphsf1CYvQDXTu70zs+E1/I0b4DgMBEmliMRqQ1/GpxoU/KZ5ZKy4xNtS0PDKI4T9pxg4eG8//77ikW5gUGvD3iHfY6IkTZjuSr8dGVYhBW2ReZeWdrWBpIc3t8YD/3bu+33scgZsxGbdVlent6l9yKqDPc/ihYFV/mENMFq0yN0lB3cKjANrAgxfrdju5TDxGUBi21uWJn8sSsRHET6V5mhPwXsvw6TmUVIMNlT6J2+tT/3z9lXdewA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3317.eurprd03.prod.outlook.com (2603:10a6:209:25::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.20; Wed, 1 Dec 2021 17:03:37 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%9]) with mapi id 15.20.4734.027; Wed, 1 Dec 2021 17:03:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Dec 2021 18:03:13 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [4i7heGZwfnei4DNeOMLNY/s3ObiDopsI] X-ClientProxiedBy: AM4PR0501CA0047.eurprd05.prod.outlook.com (2603:10a6:200:68::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211201170314.285597-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM4PR0501CA0047.eurprd05.prod.outlook.com (2603:10a6:200:68::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23 via Frontend Transport; Wed, 1 Dec 2021 17:03:37 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b23fb368-d162-497f-7c87-08d9b4ec842f X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEticfBlUvjU5KrUz5H1+LWHl+KuoK3Q0I3pVdfMYXBa023qn8lfjaIeNvu3TM3Z70mcDs7OgGGOfs16qHmQ7QRQ2p5Nc24afKyzulbwaCyydyeiOwEzfYcEUJpAyEhgfS45QCkWvMaiOFqeiW/urujKG5JqzLA4P7ljoBa2iA0NhOJvj1Hsx4SzJlBJL1dSjnSZItA+1W0Hktx5uueKjc8wtWgnTBSvpiiDa1Mt9LNbxaZP2KIdzMfm7+IR0Wx39YKxhkp0rqaBSYn3Qt++ATlEr/0tcC42DvdaXwzZZGBM2DTLvZFjR3AfBHb3rxNlDzNT/ObQ0H8jTGn0DRdZm7P5/e3OyWcikC1yMWByTzOxdqkyv7uaigbk9zlr6nvYXuNmtmevJB/rDttx11b1oibwB/1Q97tcYTsWL6/AHgEPN8A59+IUJw0k71cQNLv6mtAcNodbpmoZcQmsPbcHWHmkgQ6JpaDEZKSaZfFhyL7udCY0HNYO4sLTZLL7bOJrdLtBAnxm4/YIwn5nJ7MdpBPENEPk1UbwsqIqB/+w70X6zkTaQzaIrbIP8/nLi2MPztCJKUPHV6SLy5kaO2y6vos19xVhr/rZ1UfJitLtJFKVBw3ewJU6Og+AXPmrBN7tM3ELpY5SPXQzTpszQWLhA5GamM+zpgmUFidhWbDbEAwU8aE3vVjTcgF9ZrqwClNvn6C25OESVSgMippx57MB7qNxvbWWhPJ1AmkXxQlAue76/sQ1u4MY/9L2GNo0tER0/icVp+uakt7LmvALl9UIcTi3 X-MS-TrafficTypeDiagnostic: AM6PR0302MB3317: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2JDkeURKi04b8BqjVcg/NxcJlN8TugnL5dyiILUFK0+5+BaLVEz+hTi0xWg9HvnGnt5IYpX6vaQfL36FLTt3j3JGW8QXSo8RxNVZPbBkwhxDtqs72CWVPSZchQpu7AAms9++uqERE63KP8e5XaI9ipH6t26yTvomodAD3BnqWZ3FQF7vQTWDeWYvNKTjyu5OHwof5Gtk1gEToMZSgznYLAx0M5LWFN7jb0RI5shdyEvjMVwdfOOAjI5QCCw0dCw11GPjNM5a3vTGS5rEEx0KdD9fvifbgVWbEYnEbguyPplQUmYoRbTP2wFpJzQKAhve29ugji794PAqxEV2BOiotgxF5SdWrEOs4CqEb/WoUElUz1G2imbPBvNUpOfg6KNcSluM0KYUX1HTKeNm/uMAPGs3alJHVzGcawVjZK4Nlr2MhNz3XeFvnRXHUzq7f8ZUfJon277IN5MUikV5CJ0WmwjZzbtdIVluPw+YjU+G7+nlnYYnFPmRNbRWaun+qvA97CwURkAxMUMdLInh/Nq07ZAa+nqg7Btjbqjt2Uxl8YD+wVe3jyRfF0awNSvZgNq0z0XkC2odQP8kKTRqXXAdsg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /OY0tr3PCFq4eAV8WGcsaYDtcvjA0Q80j0252TtcVe15tFTFDMqhhn+McRaImnJFuyFPHXbWflOmY1ONQ69mXKFaUhTna7QA+tf90M3NXP9bosIZUmQXOl6b5RZ63qsr4tm68/7sGo5v2+FSGd/oWaYDRaLfKezRIpByywZ26AnKLku01HPYYcK6+NNjdrAFj7tOTCTVLN+v+DAYQnkNB7uyd1n0b4/WxS4liZYG4R+l1cwIQoa/dNZ1QsCpJeHY20zGGIBURRiIBv7EMhuqf6nNQe17H/Rl6RpQCCMvIcgeWOtw0q+ZvFC8OHaFXW5vbj95gUHF+hQyhe3p6lj13swQtjg6QY4xjjim/KO1PwczE/D5scuqdeJDmEybnogOSL2ClZ1Rs5RnVqDEaWx7iv+YBWY/msmc2YA486P8BiYjrfP0alB/RRPNz0PwNMaLSUj66OctBdnbBRWb+E8bIOSOK+GqX+oIb3RiVqsIqkJIENzOYG+cPDUsTUHFntqaQ1p9XPR74Sp5C5Srawo7j9ZovJqy6iR+OwEELvgXKUce4Oj+E0iqID//4BJs840C3RnKtYAEUp63C/H/l7DBrrReIDm53rO6G0ZJoEa2O4aMmLiELWtbybra6iB6s2cHSPRB6VNKm7eZ6kvjciCBirNGwhNnT6Ai8DLpck258GSh8aQe+vqDZqaFRRt/t6XHESrNa6inTITaQe/fYZZHYjfjK5M52OZG9yZ1pb5YuVDj61YL/hWHleM3lHk12vdQbjVpuOJRrvzh0Zxe3hRaQun4PrMDP2zE3H4yrCOj5vmDvqOeQTbpHwb0tCWoXTnQ9yK/wZfDXNfL+H6DN3JjxSizwW6qNWz6MhCxrAUyZFAfdsjiOx68wLNtgpPQ/lv/xtMpg9npS5Cre/2Aq2WfyvKWbZhny7qnBLmXd/0zn8SpgCQmh1GfLqv+silpwpWd1Zs5rGHkiE6VZKlHZHZbiA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b23fb368-d162-497f-7c87-08d9b4ec842f X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Dec 2021 17:03:37.4692 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0302MB3317 Subject: [FFmpeg-devel] [PATCH 3/4] fftools/ffmpeg_filter: Avoid DynBuf-API for writing strings 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: whhQFXHmb+CC Content-Length: 1615 It is not really natural, it requires internal allocations of its own and its error handling is horrible (i.e. the implicit (re)allocations here are unchecked). Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg_filter.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 452b689d62..47bbb67ce0 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -201,17 +201,15 @@ static char *describe_filter_link(FilterGraph *fg, AVFilterInOut *inout, int in) AVFilterContext *ctx = inout->filter_ctx; AVFilterPad *pads = in ? ctx->input_pads : ctx->output_pads; int nb_pads = in ? ctx->nb_inputs : ctx->nb_outputs; - AVIOContext *pb; - uint8_t *res = NULL; + char *res; - if (avio_open_dyn_buf(&pb) < 0) - exit_program(1); - - avio_printf(pb, "%s", ctx->filter->name); if (nb_pads > 1) - avio_printf(pb, ":%s", avfilter_pad_get_name(pads, inout->pad_idx)); - avio_w8(pb, 0); - avio_close_dyn_buf(pb, &res); + res = av_strdup(ctx->filter->name); + else + res = av_asprintf("%s:%s", ctx->filter->name, + avfilter_pad_get_name(pads, inout->pad_idx)); + if (!res) + exit_program(1); return res; } From patchwork Wed Dec 1 17:03:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31868 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp9532158iob; Wed, 1 Dec 2021 09:04:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJy/KEKhcX3/5/ao9EVuZT7wneGkwIIHQYv/2wdFW9aOEbK3Zkk6sT8FZvB5pVrNxcY8zT8U X-Received: by 2002:a05:6402:35cc:: with SMTP id z12mr9844179edc.393.1638378240199; Wed, 01 Dec 2021 09:04:00 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cw16si344424ejc.533.2021.12.01.09.03.59; Wed, 01 Dec 2021 09:04:00 -0800 (PST) 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=MmaobO5s; 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 D2D3068B024; Wed, 1 Dec 2021 19:03:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072085.outbound.protection.outlook.com [40.92.72.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 64E1E68B029 for ; Wed, 1 Dec 2021 19:03:44 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EpOAA2SRIGP9PFf46PCvceZnugMXjbsIf3Dunm8QXg9EAi7TA0GRb4UoyipQ86hQ9H8HZg0bidYhb4DkBAFKRQBs8Ku46vuzPqcHGZJoJYo79ZO3K6C6gzcsGn4qHouWJMGJ19UoY2ykzxkDyPb8P8AxP6Cl6/KysiKE+Z9ZAVBViL0L8Aeaoijx0E7C9x+5wv5MtzokaqDIlrzMiP4JASWkxSAsrMAmDmXCwjcqLeSJiNzGD5KoYtLJKZ4ksP4J6SyVatCCkx5nhQDy7MaR4EcoXfgc0VEYZj0IxiZsVaiXFJz+Ssl+iqBiIELC6XVF8nEubxJ75I8aIZT2KhMbXw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TNqAWC9pajYzTNYKnBS73vt5ISFJM5GCbKtaO2YFzh4=; b=OnfVENfLneiqtn+SidhWIcejaprl7cnAUzNLhwyZ+XRR4UYsYt5FozMFys+3ruqSmjRBEc2V1s7isp0dhz/r+iYWyKLPnvjWxit7rOY17ks5d3dgkCKGHZMwxmWQmyGaLc1vew8ggMeWn/wtDf6CCjEvTH0w9yWHW2W4XJxtpqHpWljHb/xKjQBTNTAXjlruVjkzCHHgz9l//jSN079Uc+9ul5LMm+fU8HDCyUWYkqKVkJ7lTTke/wrK9O03/95eqCdVBP2zYwCHGtSzMNhgwyvNxV7/tl8r90gHofVKfA/Cly6g1UtdRcxjf7nIMpVp0Dd7C5MK5RB8KnY5oBDd7w== 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=TNqAWC9pajYzTNYKnBS73vt5ISFJM5GCbKtaO2YFzh4=; b=MmaobO5sCLB1ODExQ1znlVug0TeLOuGJVLL+f0Ho/GQhuxl3XjYMZR6Pa6v8m7DhG7tc/OtGI1bl0iTv0URDE8ORVfokqUGQXIfEZvvl/JJOnzIG8CqYgc+QWrlGigHouEkNFRXrV6b88/UHljyAnCowLIxpHIV9kAGRqSnTf3UzoJ1sSISSDdyuQbVR6xWUDCcOc+/zNAJ2DMnV+Cd9Zy/OWx+R5UVbPDHcylS2vOQP3sGZpAjtvNolny0eqotodYOAO7ZSU99nuOlIOL2NoylyUq29XfLEHDGZwlYq4uLz0qJ5okriZxfHiULuHg+H1Qp53W/Uuo63bUZ7vCH4Xw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3317.eurprd03.prod.outlook.com (2603:10a6:209:25::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.20; Wed, 1 Dec 2021 17:03:40 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%9]) with mapi id 15.20.4734.027; Wed, 1 Dec 2021 17:03:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Dec 2021 18:03:14 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [WaCkKQSszlqaGQ1veyKCPsac2QTCFo7y] X-ClientProxiedBy: AM4PR0501CA0047.eurprd05.prod.outlook.com (2603:10a6:200:68::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211201170314.285597-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM4PR0501CA0047.eurprd05.prod.outlook.com (2603:10a6:200:68::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23 via Frontend Transport; Wed, 1 Dec 2021 17:03:39 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f58a62ab-ee5c-4b76-868c-08d9b4ec85bd X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEticfBlUvjU5KrUz5H1+LWHFbLWk6QmvnAi0psYWaDj/qJ+oePdr28yd9Ty2+frYTPrzMiqy4yu1yTykQy8NyWXnU+rr68GKpMuVmmndEieHBDrICZxWM16pjawbQzNx+n9Ex+0rkezgWgYsmzaS33LqqsJRx5dapQNjTlyhLf641nB4mzqIJxhg5NF2EpZDtsALjcm6iCQPpRpmnb3gUCFGNMDzVbIJb89s4+uf/j/zUmzngDFR0BvuqHTJ1WrZ+iJdwHX93aO3wl5Z2RAYfCPbUhj4x6Cp1uPPkTMlnahlKkrBCJGj4DlspvY9OFcTFOmJ0dRHe76FSadpBCwcjZp4HCp0EA4WSg6OJuXJ8fAjVtj3c5VcCVHCHxMXV7UMeoqAKciIUl0doxmkU17PeH+7JEstTykQ/tygDCruBtSVU/hxpErCvrOnBOvIjFdodGe4WtpvpUb9DnTyClmTP8rxqDiYtKqbSL5yaNgK5PC+hyhgW7xJaR0bc3DRJ3hTvaguAU51ua/1YQBlZuZBEc5BTDTGaaqONa2BP7ZUiCHZqDFrhZR8H7fasrSPpxhwjU0bBve6Z7bJ0Jclbq1gyC2/S4oOUaDF5GOhfxy7/p6vqPGvY8c7/PY8WmEX/UqBeth8e4EZ5E6VmIl/+8/8LWN7ese8rQXt5rPYuoaXzt173JCKrLng8Vmjh7O0oMiLqOe8XMCAb0CRqFj8YPoyCYQiKlv0aQi/mpM2KVKdJ9pzJWI07bK9wr7Zr/WE7QF0dj10dj9qR3iJNV5M9DXA4uW X-MS-TrafficTypeDiagnostic: AM6PR0302MB3317: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CtDrcTu3Ei+LM2TCarBbKODGbOno+Mwr7WVP+9EK37toUZh8i/lczDMwnXlQcyxH+3ewSFLYLCu5hWgulOSzNih3808Bs6YqoeNzxF4ENZHtiujgdMwK6zYTyhQOqvtptsM05LEwxD2xA5RNKp5E2oLaz3V4a4he8mK92mXON1Ff4/UzUSmJpNBtumcApS94MQ8qXOBY0qbB8p3Vsymv+P4Sy3jz+uzwO923yTf1eCSXa2W9XX5FDXCH6z8lqEluaGivKX7N2+shmf6rO7grNArUh/Ap6BLIz9vT67rYNvwz29QPADVH8e3w0+fmQbPcD1DKOYKvG/6PQdr2pmWos17HpGUAW6WeB05dyZT4sScKjcWodT32lX7xDN2rydkVZfYXKYOGdQV1aCKZ2ZmVsJIz0Bao6cERQ+jySCxz2LgmxqjjTVSEy4XNRSofAA+gZZlbSioe91AmXoSfdPmje0MAFCw4qp/UTynDjQ4/YOPdnOYBPiJ7qJQUCkAnefWfdWYFVlI5k/g657QW/qM9UTbLmwp+fZGgUZURNufTUWpCJcE1vtlUl1ulKlOJqyf5jric1+Ty9SgZGLaTaqbetQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dDgu27TycIzaGfsNgJX2cbFuxV36snkUpLfGt2/Pa5/95pcuV3MZ7PRaLMYszf6pjdwjw/38ywTAu4Ocy4hNcXtXL+o1tV4DrLPMOi5+kPMYEkpJVUbiq8iFixiQspkOhwbqfF0F/Zd5jCbtNdM0WrGGVSa+uZ23eoW5ysD7skWo+3/6pog27pdiPacJnykHxU2/yX4C6PJygeP4mMDgpnnZxIKOKqgWeE1vAnBW4fIDXZZjyo6RiIk+MFwi4yISOd5UX0mwJOg4hB2H+PbZ9yXtvghk1Jrb6IH+uD5rSXvkNvVi64u5mE6BuEboV7y2G6NzjKW2IsvKQwVCxP2t1QrDgdGpjOwb56gfw6thbXDDNvUUAHf0jDyvgclnAe9fAntHd0fO7o5UwjmPyrHo6zxSmG8e1VNUFcy7s4m7S4QNkGGNuumXd4LsWpWTCXNGu4Xwarzd3m+LTVmpvCUH3cZOmnwRl8QFFb5CTcOUWo8f2uU3tysAQ0X7BdbSDiQ9LdjTmc1KrRZP4WbGpOYODyIg/SHWEaFk6tAs9yvaInrbNZi+XT3OC9lFVf+zfwnmQF7WKwp92IJnb45ZD/PkcdelouC9ize6pobkJI8JnSXWbX2KyGNoFKHMmvzLn0lyX8awqfZauOG4MSIfcRpaU6jQvxsqaMvPI2Ya5eDyYmr8A4eyhc30VF15/mEKQj7JkgOsvoIJGYD8LvJ2aa2tQ0oQ5IHjL+eGsqx14YzsBuSz47MCSllbAKkndD3E+/3cQtC5BvE8KGycbqcES+UrxhwX0QN/ZXJFVppH4ZcUwpJjCJ2SWs7wInNdS6w+cvD4GfsKGErSoyzXE/P6ZK9KmibIai72Y1Vx9K2dE6cDLq7J8lzSpd4FBfBJ9xoVsnBifWItz4dhTJZE37RLY0er3B2RyPCNWbjlVoi8K5+8zO6mEuzycRAks8idAD7qbKv2Xu3NjwZP7WjC6dH+bVNLAA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f58a62ab-ee5c-4b76-868c-08d9b4ec85bd X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Dec 2021 17:03:40.1027 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0302MB3317 Subject: [FFmpeg-devel] [PATCH 4/4] fftools/ffmpeg_filter: Avoid DynBuf API to improve error checks 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: 5m4jimfNglAk choose_pix_fmts() used the dynamic buffer API to write strings; as is common among uses of this API, only opening the dynamic buffer was checked, but not the end result, leading to crashes in case of allocation failure. Furthermore, some static strings were duplicated; the allocations performed here were not properly checked: Allocation failure would be treated as "could not determine pixel format". The first issue is fixed by switching to the AVBPrint API which allows to easily perform checks at the end. Furthermore, the internal buffer avoids almost all allocations in case the AVBPrint is used. The AVBPrint also allows to solve the second issue in an elegant way, because it allows to return the static strings directly. Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg_filter.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 47bbb67ce0..dab0f28819 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -83,7 +83,10 @@ static enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodecContext *enc_ctx return target; } -static char *choose_pix_fmts(OutputFilter *ofilter) +/* May return NULL (no pixel format found), a static string or a string + * backed by the bprint. Nothing has been written to the AVBPrint in case + * NULL is returned. The AVBPrint provided should be clean. */ +static const char *choose_pix_fmts(OutputFilter *ofilter, AVBPrint *bprint) { OutputStream *ost = ofilter->ost; const AVDictionaryEntry *strict_dict = av_dict_get(ost->encoder_opts, "strict", NULL, 0); @@ -96,18 +99,12 @@ static char *choose_pix_fmts(OutputFilter *ofilter) AVFILTER_AUTO_CONVERT_NONE); if (ost->enc_ctx->pix_fmt == AV_PIX_FMT_NONE) return NULL; - return av_strdup(av_get_pix_fmt_name(ost->enc_ctx->pix_fmt)); + return av_get_pix_fmt_name(ost->enc_ctx->pix_fmt); } if (ost->enc_ctx->pix_fmt != AV_PIX_FMT_NONE) { - return av_strdup(av_get_pix_fmt_name(choose_pixel_fmt(ost->st, ost->enc_ctx, ost->enc, ost->enc_ctx->pix_fmt))); + return av_get_pix_fmt_name(choose_pixel_fmt(ost->st, ost->enc_ctx, ost->enc, ost->enc_ctx->pix_fmt)); } else if (ost->enc && ost->enc->pix_fmts) { const enum AVPixelFormat *p; - AVIOContext *s = NULL; - uint8_t *ret; - int len; - - if (avio_open_dyn_buf(&s) < 0) - exit_program(1); p = ost->enc->pix_fmts; if (ost->enc_ctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) { @@ -116,11 +113,11 @@ static char *choose_pix_fmts(OutputFilter *ofilter) for (; *p != AV_PIX_FMT_NONE; p++) { const char *name = av_get_pix_fmt_name(*p); - avio_printf(s, "%s|", name); + av_bprintf(bprint, "%s%c", name, p[1] == AV_PIX_FMT_NONE ? '\0' : '|'); } - len = avio_close_dyn_buf(s, &ret); - ret[len - 1] = 0; - return ret; + if (!av_bprint_is_complete(bprint)) + exit_program(1); + return bprint->str; } else return NULL; } @@ -416,12 +413,13 @@ static int insert_filter(AVFilterContext **last_filter, int *pad_idx, static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out) { - char *pix_fmts; OutputStream *ost = ofilter->ost; OutputFile *of = output_files[ost->file_index]; AVFilterContext *last_filter = out->filter_ctx; + AVBPrint bprint; int pad_idx = out->pad_idx; int ret; + const char *pix_fmts; char name[255]; snprintf(name, sizeof(name), "out_%d_%d", ost->file_index, ost->index); @@ -457,13 +455,14 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, pad_idx = 0; } - if ((pix_fmts = choose_pix_fmts(ofilter))) { + av_bprint_init(&bprint, 0, AV_BPRINT_SIZE_UNLIMITED); + if ((pix_fmts = choose_pix_fmts(ofilter, &bprint))) { AVFilterContext *filter; ret = avfilter_graph_create_filter(&filter, avfilter_get_by_name("format"), "format", pix_fmts, NULL, fg->graph); - av_freep(&pix_fmts); + av_bprint_finalize(&bprint, NULL); if (ret < 0) return ret; if ((ret = avfilter_link(last_filter, pad_idx, filter, 0)) < 0)