From patchwork Sun Oct 6 05:49:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 15528 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 DD0CF446EF0 for ; Sun, 6 Oct 2019 08:50:07 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BA52168049A; Sun, 6 Oct 2019 08:50:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E6B8568047E for ; Sun, 6 Oct 2019 08:50:00 +0300 (EEST) Received: by mail-qt1-f194.google.com with SMTP id j31so14672466qta.5 for ; Sat, 05 Oct 2019 22:50:00 -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:mime-version :content-transfer-encoding; bh=ChD8JaS4KX+0Jm5hTi8HOEJWtTFSfpU8gfCOq5bSFIM=; b=GWirE1/hx3uECchXK7LTvTimcebGt9D0d/QyIHlbXc/zMFadsUPREHtEy2bOpQ8e5c /mf7RLij6U4mPA6LV+JdFR51YebsqUzgpxOJZ4utv/QOec3E+JuelNqMbWgiyp15iU7j xPMwLxOTTRuIH6UeliKG+uP7oyymdIV+8D0uIOS6dHJkc4bxwCfR1AbB6bOMhH4/WiG/ iZ9nM4PdK9S8UcEu79JNqHi9w+kvbhlyuEnceogyqQ4cnHqJzrmxLMKsdWxMFZ698oks rHks0uHlUvXiIxdbVhbNvWE1SP3Iub+CaSbfvzMKJbvbXRdux/YMsQ6hPQ3YawXV6pJg TwaQ== 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:mime-version :content-transfer-encoding; bh=ChD8JaS4KX+0Jm5hTi8HOEJWtTFSfpU8gfCOq5bSFIM=; b=gfir6xnexRF2IDNo0mpUwXz3Gn23S1gQmQUcGDEh2XJrqlKmmaT2Awt1HE/mw+8/vw EOPWSbQLyUAmsp7Yj80uYzD3CmURz8nTN7aIugKyDJ1pi+MUpmoN6yszcqz4hvgLUfAt X1UEVL2DOOh1bwblc6yCdS9jA+C2VR3bdLyKPrP5wddIkxOtJa+TO3gKa93NFpfxRmwL 8GXC20Y0psotdblycmZLLnpQhThrQtYPNu9O0rur7MgNOCrVcWobMRsC8KnHTJJSwu89 OBgIm59LF2SROgr3lIliETJ0oUVo9zeCH8W1yNtrrOGS5OR2YjCc5OgLkZBP94AJXUdx nV5Q== X-Gm-Message-State: APjAAAWcpSkcXXiY+b+vu2vAtO0CqJ9wxjcVNeK56S1Sm2V16JdT3C8N 8//1MIfR7t+C0IJbDzpSBsvZkTbu X-Google-Smtp-Source: APXvYqzoCw+pc0a9UP7FKaMALdrXxBvKQ7TCw/zWeIoJvCjxqeGhg0/hcqDHZTxoK9Xl+eAqp4gTug== X-Received: by 2002:ac8:1c54:: with SMTP id j20mr24352714qtk.302.1570340999270; Sat, 05 Oct 2019 22:49:59 -0700 (PDT) Received: from localhost.localdomain (c-71-232-27-28.hsd1.ma.comcast.net. [71.232.27.28]) by smtp.gmail.com with ESMTPSA id 54sm8267073qts.75.2019.10.05.22.49.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2019 22:49:58 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 6 Oct 2019 01:49:46 -0400 Message-Id: <20191006054950.30374-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/5] avformat/chromaprint: Fix fp_format option 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: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman The fp_format option was incorrectly declared, meaning that it could not be set on the cli (via recommended settings raw/compressed/base64). This is fixed in the commit. --- libavformat/chromaprint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/chromaprint.c b/libavformat/chromaprint.c index f39c09ddb9..547e801cdd 100644 --- a/libavformat/chromaprint.c +++ b/libavformat/chromaprint.c @@ -164,7 +164,7 @@ fail: static const AVOption options[] = { { "silence_threshold", "threshold for detecting silence", OFFSET(silence_threshold), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 32767, FLAGS }, { "algorithm", "version of the fingerprint algorithm", OFFSET(algorithm), AV_OPT_TYPE_INT, { .i64 = CHROMAPRINT_ALGORITHM_DEFAULT }, CHROMAPRINT_ALGORITHM_TEST1, INT_MAX, FLAGS }, - { "fp_format", "fingerprint format to write", OFFSET(fp_format), AV_OPT_TYPE_INT, { .i64 = FINGERPRINT_BASE64 }, FINGERPRINT_RAW, FINGERPRINT_BASE64, FLAGS }, + { "fp_format", "fingerprint format to write", OFFSET(fp_format), AV_OPT_TYPE_INT, { .i64 = FINGERPRINT_BASE64 }, FINGERPRINT_RAW, FINGERPRINT_BASE64, FLAGS, "fp_format" }, { "raw", "binary raw fingerprint", 0, AV_OPT_TYPE_CONST, {.i64 = FINGERPRINT_RAW }, INT_MIN, INT_MAX, FLAGS, "fp_format"}, { "compressed", "binary compressed fingerprint", 0, AV_OPT_TYPE_CONST, {.i64 = FINGERPRINT_COMPRESSED }, INT_MIN, INT_MAX, FLAGS, "fp_format"}, { "base64", "Base64 compressed fingerprint", 0, AV_OPT_TYPE_CONST, {.i64 = FINGERPRINT_BASE64 }, INT_MIN, INT_MAX, FLAGS, "fp_format"},