From patchwork Sun Apr 8 00:17:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 8352 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1005130jad; Sat, 7 Apr 2018 17:17:37 -0700 (PDT) X-Google-Smtp-Source: AIpwx49V9kkjL+Ui3hqpbMip2qCP7sq3AzPCjnwP3ZAKZw/bJWmJ/4dJnsHYEe7sudAXBuRs73oK X-Received: by 10.223.138.138 with SMTP id y10mr20360164wry.44.1523146657731; Sat, 07 Apr 2018 17:17:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523146657; cv=none; d=google.com; s=arc-20160816; b=0MxzbanxyEBXW/AGhVkLgrwsbm+2g7x9FMxNT7bwInA6C2sdBUzeguwAkrRGEL+6+G yhWeUdWNcueEEEYRBbDtWJB3/ghCAzMVNuNB89jyLLnCVdp8sESjkVd9/rlWnKYflnhu hHo23F8xEp6vD8Myg3D4ceyGlSlF5VkfARv48BD+PVZmkpZyPu/hpY7f50igs8+6ebD8 TcIDCR888vGzzF28ETnmyiV6Ik57q2fLZFogKAm+PDDDWw4wRuodEq+0bmBxtVCr7Av9 picWQEDAMcl3s0JWLjS997j6TVyg4sUOTZYWWsCNuLO/CFC38EBvNb541WwceWT9xE75 LzqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:mime-version:user-agent:date:message-id:from:to :dkim-signature:delivered-to:arc-authentication-results; bh=byi65BfCvHbl3y3TqDCqR6SzaRERQ7kY10ekx7ph1t4=; b=WO3k5gitUumDqCugOHJMPFyfA3s/y+7Tz4WjJwKuGIIwCgzYb+spA6lEkTS8B3cDE3 HyUl5VnUIF532q5aGMrqiRtdD6llphhxpY7V3xJWbz8o0vfIH0Efvlxe/dT1uHH2684g koVYMUT3JhJKhzVP0Nzc2cXCWrCH8Ux3CaFWDiRUSyfWk7rZjDu6Ex58UE/m0bYlR5NW JGAh5fPZVjsPLLBoNsfdQ+Maw4vjbWDUIvXQWn/PZp8Nesjw5YRg5B+hPpdwHdKOTF4Y M0iA8QZaz0HLU255yvBElmSReFQZ6WdKoCqatHdeLLm/B/06pvL0pzZ2m5Iw0o5QySnh 6hpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=j0Hg8UFe; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4si9591354wrh.100.2018.04.07.17.17.37; Sat, 07 Apr 2018 17:17:37 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=j0Hg8UFe; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 44B64689C79; Sun, 8 Apr 2018 03:17:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f180.google.com (mail-pf0-f180.google.com [209.85.192.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F0CD968031D for ; Sun, 8 Apr 2018 03:17:03 +0300 (EEST) Received: by mail-pf0-f180.google.com with SMTP id j2so3359698pff.10 for ; Sat, 07 Apr 2018 17:17:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=7CyHH/Tq+L6ZzZANR0BKAS9YMz6SUTR79RyF1WfzMvg=; b=j0Hg8UFepor3sm2uMCE0aQSMOqxda8fuwiEADXxja8AkS1V0aMbYx54+yI3O7i1rwA 7lrb0T1mur7WbDaTG0CP/6QMWI6Rg1xoqDdDQNP/gQRQbjbP2RT9aYU1QrMp6NnAWlfJ XeOn3UlFtJ2uoVyIOZ3vufiUXQXNAHwXQtBNKCSb3plaWzroWsRfe4Gv/PNui4hacCEf rjlez/WmWYPU0Jc4NRIdJQUFp2a1D+dwC5LIahjj6hnywKWatNKQ2gErlWC4r68ROieO cKCKv5DlJ0C3u7Bt4VovUBBhNjBrLMJgxghh1W4FhuohpH80SdH4fLxsMG6EXypuj6EQ VoAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=7CyHH/Tq+L6ZzZANR0BKAS9YMz6SUTR79RyF1WfzMvg=; b=Uz0ju97hz2H5OYakhJFc6u2XwTeJ9FoK2DP3E6mKJJqiRJ+UHmwCxzWuam+NzSPN1U L/XhZfbxJUkkqApNAddrbczaJlKCh4v9fffCaG6V9VbDP2ffZ3W0WgdRkrD0PubK4cfg sIiN/CY1NRMtRMC2YTN+j3yibC6tRbcMpBjbZiVmsNpAMCj6AlI9VH5oL/OvWSp66I+/ 60u0lSpPWU+hdVC9wFTdNjO9ytWeoWC8Y/oUXtSsXKMPdnKz0p5J0LwSP8ftf+XAeMd6 Ofwy4rx4YOMxiDs1t/GfeixGGTHnU0/FKA/oxZ6cEAz81DZcJNAKqG5rQIQr8acKoFbd qJfw== X-Gm-Message-State: AElRT7Eph72XqeG0fop0ysqmUwiIdj7Jsq9LbLXx5VJ4Oq2LDFpIrSuz H9m+d4+x8AFQBPdwiRY8XDU= X-Received: by 10.98.69.217 with SMTP id n86mr22878546pfi.41.1523146645267; Sat, 07 Apr 2018 17:17:25 -0700 (PDT) Received: from [10.67.68.20] ([192.55.54.40]) by smtp.gmail.com with ESMTPSA id p6sm26699573pfk.104.2018.04.07.17.17.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Apr 2018 17:17:24 -0700 (PDT) To: FFmpeg development discussions and patches , Michael Niedermayer From: Jun Zhao Message-ID: <3849a691-90be-8e5f-4fd9-005d8464c5de@gmail.com> Date: Sun, 8 Apr 2018 08:17:22 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH 2/2] lavf/format: Remove the dead code in av_probe_input_buffer2. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From df6293f42fad1e4521389c23c984519caa98d3f5 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Sun, 8 Apr 2018 08:09:13 +0800 Subject: [PATCH 2/2] lavf/format: Remove the dead code in av_probe_input_buffer2. Remove the dead code in av_probe_input_buffer2 Signed-off-by: Jun Zhao --- libavformat/format.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libavformat/format.c b/libavformat/format.c index 1c66afb7e6..2c4c895530 100644 --- a/libavformat/format.c +++ b/libavformat/format.c @@ -250,14 +250,6 @@ int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt, *semi = '\0'; } } -#if 0 - if (!*fmt && pb->av_class && av_opt_get(pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type) >= 0 && mime_type) { - if (!av_strcasecmp(mime_type, "audio/aacp")) { - *fmt = av_find_input_format("aac"); - } - av_freep(&mime_type); - } -#endif for (probe_size = PROBE_BUF_MIN; probe_size <= max_probe_size && !*fmt; probe_size = FFMIN(probe_size << 1,