From patchwork Wed Nov 6 09:00:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 16141 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 B1B87448A70 for ; Wed, 6 Nov 2019 11:00:59 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8AEF868B076; Wed, 6 Nov 2019 11:00:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3000168B076 for ; Wed, 6 Nov 2019 11:00:52 +0200 (EET) Received: by mail-pl1-f193.google.com with SMTP id s10so273841plp.2 for ; Wed, 06 Nov 2019 01:00:52 -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=PMygkGInNIOoBGtwPu3j9XwDBo5sp/xigA5AOWd8q+Q=; b=SzSnlCYblhsJN38kgI87iDoNthrXsjt6/ZRR7JKhJGjJUqj7SoW8wvLHbdX5J/JxNF MjQe7f2+25wfPPNJcF9ukhxVt2oQWMYmYjRagrp9JbqOTm3+iY0SkZ/yTdASRdTu31Wl 1JpbZjE/Ti7cA3tKBj/z3bw9yjn9cM+D0H7R5PoNVjRloxHmweGNXCFV3dbHqtg6Grd7 1peQyHiNFyBVt/fcRzkXsoISedpnKyh9Pr5hqw9+8hKD9TrYA9D+1v6tc3QAiv4tEee+ p3Bt0RAE++dpCm8z4c6LjJdGTc9oqVERlb7siFE/6mcghrlzqgXQUNCVjTbrT5x8mdWp +5mg== 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=PMygkGInNIOoBGtwPu3j9XwDBo5sp/xigA5AOWd8q+Q=; b=kSCekrfzw4m8P5CmotxUgO5ZdC8bamG6M4pWI4IkzqDZnzEUsoP1/Rl7r04Ic7pNpx jQELEYSTE6zDTHNxbD3mGVnJfANKPOQW7zsa9+WmsdN0xdHxyymv25hIqPw8k1qai2IZ Ros8muWq0Hp3fwGHj36avGbUr89Zq5TdDS4urwTyuWsoqAYIwoqAc+GqZiwRAafp0Zsl wif7/U70y6xkhlRdI6I5wmSaT9UbzfxWRiKIYpUAvG7ZMKX7zs75sNLJETZieGDt2VCN Q78yBtLuPxmSvLxMMQrIRI6I8+vt/j+6T3xYRM3WorzBLU7VOG/UL+RD0cr0jXTFHh/J WsGA== X-Gm-Message-State: APjAAAX0kEpSl39zwHPIqAY5IroSwN1qGnSvB2PAJYS0RAGZIEM4R4jw 0synT6W9saoVVKkptbpUlRQEn/On6m0= X-Google-Smtp-Source: APXvYqwQAumCdH2ywvYNDNNZ5yeXeB3JNM0MlrvggJiU81XANxV0ed35Mh2HamjcXtrVa1FBz4T1kA== X-Received: by 2002:a17:902:9a4b:: with SMTP id x11mr1494702plv.104.1573030850136; Wed, 06 Nov 2019 01:00:50 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id m14sm14781027pgj.8.2019.11.06.01.00.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Nov 2019 01:00:49 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Nov 2019 17:00:45 +0800 Message-Id: <20191106090045.21696-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 v1] 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/utils.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 8196442dd1..8381498e2b 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -367,8 +367,7 @@ static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st, fmt->name, score); for (i = 0; fmt_id_type[i].name; i++) { if (!strcmp(fmt->name, fmt_id_type[i].name)) { - if (fmt_id_type[i].type != AVMEDIA_TYPE_AUDIO && - st->codecpar->sample_rate) + if (st->codecpar->sample_rate) continue; if (st->request_probe > score && st->codecpar->codec_id != fmt_id_type[i].id)