From patchwork Thu Nov 7 01:23:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 16149 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 92F7944890D for ; Thu, 7 Nov 2019 03:23:54 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7092268B15B; Thu, 7 Nov 2019 03:23:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E68268B049 for ; Thu, 7 Nov 2019 03:23:48 +0200 (EET) Received: by mail-pf1-f196.google.com with SMTP id d13so932755pfq.2 for ; Wed, 06 Nov 2019 17:23:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=i3Hi2zMiLdMbwIKz75z0iJUBuOhMYIKsZbuECWfquXQ=; b=CRCEfz1lrybZTeKdelfyKgtJDSe0GBv6a7qlbFzWCOFpwazX8Lu5gXvpwRSvMCQdMF 5nbVDS0ILvaOjhdZCRsWBvq0jIDljErzXwLmb7Pj2CwZXmNeNDgvCyLePowDynQUgTLa HAw227qP5xcTm7Hw+rlLILOWoXkIiXHen50YAxrKjrKnQCiRExKx+NKdxBulRHZy6gI3 X2dZ2M9ooDz+3D3jpXz7vWhYhyfoKAPSlgYJXpuStNvLoVg0HH2uZT5j3kvcVvrkIOgg S4jRiYramFavj4uxfFgcKL8vZFVKA76vk5tDtT82s9OvUr8cvdSOpUV+PIxyky3LclTt 67OQ== 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:in-reply-to :references; bh=i3Hi2zMiLdMbwIKz75z0iJUBuOhMYIKsZbuECWfquXQ=; b=dyfpXkL2d84/jhU3GCi/IrS+WL7PnQDfRiWfF0x4MIXXjAmkRarMaIFQ2o15svjC/m lZJDL+vaNT9FBrRLGHLvtbAT8Pyi+NQWlIBlXXMp+giF/oA9nEhGQE5x+Ka+oN4Mxv2z mDMzq1iM+v3xQ4ZjEY8Vva8m3RypDcspHQ5Xo4EId+VntCVYGlOfVC86tiYrfBTlBUyW QhD98KdEgYe2aKyDsBS2wErYX04W+LYs/X9pRuaV9RvtHsrUb3MxBcWf/qWk6cJg87YP csfm8h8Ly+GlLDQweEhfNBmd8q/dndavdftLYMqoFHUWSBhfM4DDXKLpH2fz+qT0ixVZ Q++g== X-Gm-Message-State: APjAAAU8Mc1x7jR2l3GZypuWKx4hOU442ZcL6C6dslNo4DovAfODhoaX ZhvYhtbNZD1NmPa6flKlE4S4P51Ydds= X-Google-Smtp-Source: APXvYqzK6uAsAf50ArNQf5yNmb0XdQNkvIeEsFgz5ftmgTZxawEzJ/tM2Q4cRjYvmdILlBD9JK/Qnw== X-Received: by 2002:a63:1311:: with SMTP id i17mr1067719pgl.343.1573089826235; Wed, 06 Nov 2019 17:23:46 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id f15sm233232pfd.141.2019.11.06.17.23.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Nov 2019 17:23:45 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Nov 2019 09:23:17 +0800 Message-Id: <20191107012317.23325-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191029094520.30679-1-onemda@gmail.com> References: <20191029094520.30679-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH v2] avformat/utils: Fixes misdetection of zYLx.wav 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/wavdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index 52194f54ef..109c931a22 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -149,7 +149,8 @@ static int wav_probe(const AVProbeData *p) static void handle_stream_probing(AVStream *st) { - if (st->codecpar->codec_id == AV_CODEC_ID_PCM_S16LE) { + if (st->codecpar->codec_id == AV_CODEC_ID_PCM_S16LE && + st->codecpar->sample_rate <= 0 && st->codecpar->channels <= 0) { st->request_probe = AVPROBE_SCORE_EXTENSION; st->probe_packets = FFMIN(st->probe_packets, 32); }