From patchwork Sat Oct 5 05:41:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 15510 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 7DEB7449D96 for ; Sat, 5 Oct 2019 10:15:35 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 562D2687F38; Sat, 5 Oct 2019 10:15:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E8352687F0D for ; Sat, 5 Oct 2019 10:15:28 +0300 (EEST) Received: by mail-pl1-f196.google.com with SMTP id q15so4185285pll.11 for ; Sat, 05 Oct 2019 00:15:28 -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=TlBzHGL8NY3xCB6UTlcWKFqJrmyKmyT+HBiUsoEGSuA=; b=r3Rs7MnJ4n2J/oUk5wO6WU2qqD1biQpbOSI/UwDXUSM/6Khe1EioTiocW+eoKG1sU5 4k/zf7ptx3BT/W+hXLXT5c33R6wH3iQHvwCR3oTVsTbUpJu3gZfHo7DE/5MQAJklhm8L SrnwVyrYE528wM9xydLMo/ytW9k/pnXvyL9le0bRX5vNRjefeth5nK3CLaWslhKw/OfO BfcDZbTrnty+//Nlf1hD3wWz4Aq5J76x9Yh9yrzvrun0HQ/oBYjAEcY+9rvs1DI3lBwa jMcG+VkjSfzyfE4mv2zfOzOeaeojy9iN8tXx8+5QHb8up4xU2J1Z1fjB2uq/kM/PrABk StZg== 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=TlBzHGL8NY3xCB6UTlcWKFqJrmyKmyT+HBiUsoEGSuA=; b=nDFX1tlXNASNcG4qr3yjli5vN/VlgCaO6XVKu5Kk4TjYjS6QsevvU+0fw71wlyjx+d Al33ZNUjHV//+0Ah8tG/0RY7H5ZuWm9ZssbmVbf6DxUvfa29F+lVWNXXM0GcVk2KQmDN Cb1HMBkQdnj2puRIBzgZJrPz057HyZ/mRhzlXgzcpfUr7mSWwi68TKZ60foyzrRwMmR7 eGRLwww47/qpBki7fr5ndezweBQ3w9Ne7PoPfaBOPpiYN3Zcgxil0BmYaV/W08GT9nTx pwMmhIPjQ9AUJ0FrMnnO37X5DJ+BTMCsXYLrNMLxehqt5y9SYn43+UGIFxhOHTbSeOwV gIVg== X-Gm-Message-State: APjAAAXeBO7ZNNH4cvUIE5dsYVEN216khyIGzQMvB/yJbcnKphsngquL wXs40IHOZL6jYAyb2mDbKuVgiMmg X-Google-Smtp-Source: APXvYqwNlnqDw86aGp6LxgcXieER7ZTNi9f5nCUGxPF4hgGIHtFf/pi74pD1GGu5AlkICQ2ww6ofdw== X-Received: by 2002:a0c:8003:: with SMTP id 3mr17681441qva.161.1570254080242; Fri, 04 Oct 2019 22:41:20 -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 y17sm4362733qtb.82.2019.10.04.22.41.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Oct 2019 22:41:19 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Oct 2019 01:41:10 -0400 Message-Id: <20191005054110.1746-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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 unit member was incorrectly set to NULL for fp_format, meaning that this option 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"},