From patchwork Sun Apr 1 23:07:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 8276 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1955811jad; Sun, 1 Apr 2018 16:07:40 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+phONmjsEUaA0dJC6XjGbqxfpTZaOvdTZC8i1dlbnJ7VDh8nG7TvDKOCpnBC2A02M4eU+M X-Received: by 10.28.20.140 with SMTP id 134mr7027454wmu.87.1522624060540; Sun, 01 Apr 2018 16:07:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522624060; cv=none; d=google.com; s=arc-20160816; b=S/RL5sq/542T9/7FfORyHgGGHnfn0Ellfsi3FFTnPrz90V+15c7Ywnwp9FdxiReJuW TbPlLAIw4MgHpDUmOZ0XHv7lBHXJMYLsC6Co+7b420Hqf0+cOCjy/axEbDHn90hBPX5D ivh6JtvdtMX3CIjc+ioWbVOKsBMsFfaKrNn5sdmMCHbaQ8+8eQvscYE51uJVQlvRrwSJ lC3whJ8wGS6nbOwawIcKIG6bn8pWJbjXljzbigS07IUJdmybAXNVcH51K2hSojUaoXMN yj0N6zrqeir+/OVv/b9VxCgASQLfYJ/Gh0fu9Ftedqak+eoCvAY/xV6vf1mLA4FAwpOn YmRw== 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=ZIuQFL9o6SwQyKzEZPFP3AvjqQWgtn4feg67cItKcsI=; b=ZjmEKL0zaWJ7QcVT4bXVSq7IRboSIdLDwhJfwkUsXpOriKFaugCnHLOIx0W30GBryM k5CQVfQUj7zgYn9nCmUwphze3L1TiXoxUygtxXu+Ufn0/IQKpPR9fFA5/OFEZAi9V0yD Zif0UEW1Wge/lsqD0QyZv0UBIHnWfyWx2mkNZ7/Lf09UeH7FdRlXYI8He/+LrSys953V iVBBfH67XZBppllDE0JIZviztAUgqK+37k3kYCrDstQ3eJ4EzW7ZPU9DLfJKh14d4MGE NKc+KfRWnAUPRsrC4pGJbiOXIPhwTV9uUa0bXsf3J21JifnvVa7bM3uKP0IBh8d9jWxV Yf4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=LQukEL0+; 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 r65si6456852wmf.247.2018.04.01.16.07.39; Sun, 01 Apr 2018 16:07:40 -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=LQukEL0+; 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 A7543689958; Mon, 2 Apr 2018 02:07:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f174.google.com (mail-pf0-f174.google.com [209.85.192.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A13668031D for ; Mon, 2 Apr 2018 02:07:11 +0300 (EEST) Received: by mail-pf0-f174.google.com with SMTP id m68so8327542pfm.11 for ; Sun, 01 Apr 2018 16:07:31 -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=ASHt1DhQhY1lQkmZRAXq8DRSUm0JrubiIfEC29oNXiw=; b=LQukEL0+75S2/fIqfp7ZY/xdqPbrk6KNQz5ZNml3WsImEDA5bAAXqZ2TOf4ieRtfRQ qt/wp6qnJ0ZFUKrM0G7OBfFbEgZv1kmCshMV71Hslv522BTJVENG6i3XWVdXhM4Rn5fW 4laU9EYNHYZdps4IJyFkuCNH81uMmiXsSmh+9XH5Y/hBchywgZDfDwurcV9b5YUfTc+q DDxeaRMrGBZdPNmv1F4gNc9W+CcXkdZgbte8u0hOm46O7SzYyPXtq6Udv0HLJmmAxlkt +/EBS6LBOGGn4rdPDtjBKuiNYXPD0CWdC+sxzy6mLXh5RQtcMUzFVozlDKA1ZVKJCyYJ JV3Q== 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=ASHt1DhQhY1lQkmZRAXq8DRSUm0JrubiIfEC29oNXiw=; b=O3rZ2fsxHkv8RAMgCGLr7tS3M5qjn+Os5vMNYZjx3FdIfXzTeU93Y4hOUDk3WvF0fp Idyl7v7NEoZkJEYlerbQuZ8o78AlSHs3IFnTAeBrOhscmfj6EkCQfoT17gnUxr3ti0Qi 7+gXsLGdlcLI2v+Ct5cLXeJLRUstPh7EbgF4WXper34beFF44HXUrndzQ20pYqwKE3R2 IHj+o7nQlfVCh+BMsCxVwvf2BirjrubCVdyVfKJ2lBAUCcVDag7T3ZrAxa/j1Ij9DePj nuYylj4UP93ptwLf77oWsXiamvPuQ1Mzm29LPVE/TLQDNPGlL+j08n533+cKN2Vz3W4z bOIA== X-Gm-Message-State: AElRT7EIfB1svmY6NIXDRxfupeVeNEzybXoeK2hllXY030hFsMHo6J+p 8C7JARTmH1kAMneo0e3LNrcvAUAl X-Received: by 10.98.200.9 with SMTP id z9mr5691774pff.128.1522624049415; Sun, 01 Apr 2018 16:07:29 -0700 (PDT) Received: from [10.67.68.20] ([192.55.54.40]) by smtp.gmail.com with ESMTPSA id q9sm21782896pgs.89.2018.04.01.16.07.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Apr 2018 16:07:28 -0700 (PDT) To: FFmpeg development discussions and patches , Michael Niedermayer , josh@itanimul.li From: Jun Zhao Message-ID: Date: Mon, 2 Apr 2018 07:07:26 +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] cmdutils: fix new API break the "ffmpeg -muxers/demuxers" 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 ebc23fc12671783dc2f77b14c3b61f95b16e01c9 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Sun, 1 Apr 2018 22:29:46 +0800 Subject: [PATCH] cmdutils: fix new API break the "ffmpeg -muxers/demuxers" fix commit 2238190 break the "ffmpeg -muxers/demuxers". Signed-off-by: Jun Zhao --- fftools/cmdutils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index a6cf002fd0..1001f36299 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -1278,7 +1278,7 @@ static int show_formats_devices(void *optctx, const char *opt, const char *arg, const char *long_name = NULL; if (muxdemuxers !=SHOW_DEMUXERS) { - ifmt_opaque = NULL; + ofmt_opaque = NULL; while ((ofmt = av_muxer_iterate(&ofmt_opaque))) { is_dev = is_device(ofmt->priv_class); if (!is_dev && device_only) @@ -1292,7 +1292,7 @@ static int show_formats_devices(void *optctx, const char *opt, const char *arg, } } if (muxdemuxers != SHOW_MUXERS) { - ofmt_opaque = NULL; + ifmt_opaque = NULL; while ((ifmt = av_demuxer_iterate(&ifmt_opaque))) { is_dev = is_device(ifmt->priv_class); if (!is_dev && device_only)