From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D6A9A40681 for ; Wed, 27 Jul 2022 14:13:48 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1B24168B99B; Wed, 27 Jul 2022 17:13:45 +0300 (EEST) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AE81C68B766 for ; Wed, 27 Jul 2022 17:13:38 +0300 (EEST) Received: by mail-wr1-f52.google.com with SMTP id v13so16666929wru.12 for ; Wed, 27 Jul 2022 07:13:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IehoWO7b+Gu2BFqpoCxo6Xg76yZXXFNCYgrJCqK7r4U=; b=GLq5V9E8/NXtJKut/42rIs10S726H3JOe+AdaKZVC2VOs7pKVljw7oeSPNwTy0DYXd hnn58cwgoKps7cyBoAtw4Vs1haxJmRLt0fg+a96FQbJuHTADAKMqD3160ZYwDC4P/Oop +FBasmAVF6CgoatwjCoCb/RT2rClmxbdRLBrq11LQLT4QfwEc7ISwDweXXGHL7pYQsx5 RtsRAt0zv9a30xbDmD1ro5M4dqB8/1iUpm4eeHTNJCfzJBjEVQjnqR2+srpDRJURPzLM cn4WrdhxhC8VoKRoBSvV9Wr7s3opxbMNm7ilBgEROSfrYZ5wv8ATjsSqMvt+cGjoFlDl aUUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IehoWO7b+Gu2BFqpoCxo6Xg76yZXXFNCYgrJCqK7r4U=; b=lcVKQpelMP2vJi+HhoGctEgh1cW8vRpXd0vVdIfbnYXk5nHM/9sV3yTHwhmEjXdudL SlTEL1cA6Gy9u5/x1GVR+eGbnrktRmVAkmYwiNTx7JsvtTC821Pq/CqDTZI08upeGSJ6 0YL0Wm+JU4ZuUAh7zmOt+H2CsywO2eVfk9u4qizcMxtJ1x2Ag5kuOZcLFnH0fVu/iCYB 74rbmt/iZhKEshkObSAFApMY1R+YsM8WXGyDuR+9iNdDeC76GZACc9K9k6OLb+d8i6jU zw5Gi7tNev5BszeSGkADF9oZtRbsUjfUahcA00/jYantwZTFcrZLqR9s6eXrbFIDzN89 9a4A== X-Gm-Message-State: AJIora+l5648U6qLMOAB/khIbimJvwZp6/gBzweP2RjPqZNl7oWmeCd0 ycQ7Ov+4KZybDwbrfDBfHI6gMB2Fp/T4Er55 X-Google-Smtp-Source: AGRyM1tSmwV1kxb+gLu7Nn9PTnNRBzj8stVQTuQxWLAw2FMyL4XsH9anBIq58YFw8cA7QfkE/SDyvg== X-Received: by 2002:adf:e606:0:b0:21e:39f6:3171 with SMTP id p6-20020adfe606000000b0021e39f63171mr13501916wrm.601.1658931217759; Wed, 27 Jul 2022 07:13:37 -0700 (PDT) Received: from C02WW1K9HV2R.spotify.net ([84.218.15.152]) by smtp.gmail.com with ESMTPSA id r10-20020a5d4e4a000000b0021e8cdd0c48sm7727716wrt.15.2022.07.27.07.13.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jul 2022 07:13:37 -0700 (PDT) From: Mattias Wadman To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Jul 2022 16:13:01 +0200 Message-Id: <20220727141301.29645-1-mattias.wadman@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_zscale: Add smpte240m transfer option and fix matrix option typo 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: Mattias Wadman Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- libavfilter/vf_zscale.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c index 91166dcbcb..999147b587 100644 --- a/libavfilter/vf_zscale.c +++ b/libavfilter/vf_zscale.c @@ -1033,6 +1033,7 @@ static const AVOption zscale_options[] = { { "bt470m", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_470_M}, 0, 0, FLAGS, "transfer" }, { "bt470bg", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_470_BG}, 0, 0, FLAGS, "transfer" }, { "smpte170m", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_601}, 0, 0, FLAGS, "transfer" }, + { "smpte240m", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_240M}, 0, 0, FLAGS, "transfer" }, { "bt709", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_709}, 0, 0, FLAGS, "transfer" }, { "linear", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_LINEAR}, 0, 0, FLAGS, "transfer" }, { "log100", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_LOG_100}, 0, 0, FLAGS, "transfer" }, @@ -1058,7 +1059,7 @@ static const AVOption zscale_options[] = { { "fcc", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_MATRIX_FCC}, 0, 0, FLAGS, "matrix" }, { "bt470bg", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_MATRIX_470BG}, 0, 0, FLAGS, "matrix" }, { "smpte170m", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_MATRIX_170M}, 0, 0, FLAGS, "matrix" }, - { "smpte2400m", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_MATRIX_240M}, 0, 0, FLAGS, "matrix" }, + { "smpte240m", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_MATRIX_240M}, 0, 0, FLAGS, "matrix" }, { "ycgco", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_MATRIX_YCGCO}, 0, 0, FLAGS, "matrix" }, { "bt2020nc", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_MATRIX_2020_NCL}, 0, 0, FLAGS, "matrix" }, { "bt2020c", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_MATRIX_2020_CL}, 0, 0, FLAGS, "matrix" }, -- 2.29.2 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".