From patchwork Thu Feb 8 15:21:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 7529 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.1 with SMTP id c1csp1998217jai; Thu, 8 Feb 2018 07:28:38 -0800 (PST) X-Google-Smtp-Source: AH8x226XZFfSvGmkbyaS4eWOtM8HeEVzDZiAYx+N7Pc0zRS0l3C7RekAGBw8x4K8SPP0mcqV1UMS X-Received: by 10.223.176.40 with SMTP id f37mr1070426wra.113.1518103718300; Thu, 08 Feb 2018 07:28:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518103718; cv=none; d=google.com; s=arc-20160816; b=07J6rSby0NO/4sAc+Sq7zpe9HVvk+3dapD/aImK3aK4BuJQLP7ueQoAjeXoCpYfIpC p3jPWoKANdztGnrjax1zVTXt91ySqLRVhum7C3pD86B9q1TNfn3P4dwpF+1qK+4P828c 9V51zvoANvetjuYdnXNbil/EICpvpRf82c2PZeV5/OSUKyf7qyx3D5+ZzM0MdbEK1tJK NvvPzIMQ9BGKEXyYQKuXntT79fpLaJY/02fpveDjMxhXnalCOstJdb/t0VM8bOd+iz1s h62XDTnkV2wmKN+9OkoB4cpW/nWtUisarrGlYzBH8+AnNzgrrTrbVgkyf1GV9mjkMAwq RxSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=WzselN91WgSW210oFDNORWIe5TmylzD+B9AsToq0vgk=; b=Bd5Z2aeB/Rqa/QHW1MC58378IwFtWE9XOW4HR5mMBV0a5qx/wcXYKB94NM64uxn/mt 3k8V23zLK2uWqaXdP4h6YfhioJME7LWKN4TlzMTk9h7XZbhMjCXu+eP/KNIbTDQvEZlP OOJe1KWmYDlYupFP4roU/EURb0eg1gGtvaOhshs1mUD8My3CvG11Jb4fMi6X7Z43M2KZ dMwUCMlQeCriWPR21TxXs+EC0t2pnR6LNwszbe217a2pYGxFDcc/cA5/JEiOfy56Jogx WHrCHshfo7JSPygVNGBgqxPL/0ISoLETbg4hQRsLcECfkdqhJWB+JpWuDp0o4jkf8hfq pYzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=mvH4LSy3; 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 a44si125445wrc.522.2018.02.08.07.28.37; Thu, 08 Feb 2018 07:28:38 -0800 (PST) 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=mvH4LSy3; 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 C849A689820; Thu, 8 Feb 2018 17:28:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 27A6B680216 for ; Thu, 8 Feb 2018 17:28:21 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id t74so10230374wme.3 for ; Thu, 08 Feb 2018 07:28:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=j8JK/O6tMUY0TrCMX7BSdNhpb5l01aHIAfN6AO8flzE=; b=mvH4LSy31LOoUGsJ5mSJg3ZJGbvwsAW+lOLWv6CnrFT0V4yXHZvXpHvwrUMQlkprPj 06Nmd6QT8UaC3CoG5CKC9DDhojWBpUESwb1j3jtUlq752uYo9xvHThUQwSwd+QMGUgds p/yH7GgkyWhVgz8A81fa17M7f7rx3xw7rgHI/LbCfd2x8APnH7Ub2mE4VgTPUNTPwqy+ IHnJkQhN3CHdu6ybf2+2V0WEefc8kS5Tki1HXbfwfAhPtoY2FahPhvHojoWeympbRQ4c exGwW1WCDPfbpmcNdkygz1InxSw2rsnMlM4gL3rRK8QGpPIeEWPehIKD3k1+7nPKrDOW mAJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=j8JK/O6tMUY0TrCMX7BSdNhpb5l01aHIAfN6AO8flzE=; b=WNsWUa5qc4uA4p/9Zz4SpBVbzsjrFU64OyVUncXMSfr1WvKmgYzT2iDicA7Ti/HYIQ NVYDEDrNDP5rXBq+QHFKa22WDK+029cszdLbMg5AomxXYOlSFCSb8CDo8Ctoo+3OtTTe DxpiPZpcRdKsb1Fg0iO9etFmnf7aq5puNV7fs/mrs+HsvoeWwrO9CNpWVwTR21UI4aqk 1PKIj+zsjJmdx+4EH1oI8Gc04CvXsesC2v7Tblrjh9YodxJubCAMoQkczufyInOiLnLQ PxSleIj1yGS7mcSUX6ViZeHYWAxt0kwR7ICt+MagmpGEkhsgLimmTvhkVWvGVlXEt0CZ W49g== X-Gm-Message-State: APf1xPCKomaTcYaaktNa7KxY89OOD10MgNxCGuI5c/l7TljE8WRPyZCx mlW0jPn3r5Hf4ZVM9W5OE+mzBFLv X-Received: by 10.28.55.81 with SMTP id e78mr1458109wma.50.1518103344116; Thu, 08 Feb 2018 07:22:24 -0800 (PST) Received: from vimeo-vm.localdomain ([93.186.144.237]) by smtp.gmail.com with ESMTPSA id p5sm189487wmf.13.2018.02.08.07.22.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Feb 2018 07:22:23 -0800 (PST) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Feb 2018 15:21:43 +0000 Message-Id: <1518103303-22832-1-git-send-email-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH] cmdutils: Do not unconditionally define functions using avdevice's API 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" avdevice is not a hard requiremnet for any of the fftools, and this was broken in cdc78058c78dfa4966758a342acd2c1f3b282c46. Fixes build with --disable-avdevice. Signed-off-by: Derek Buitenhuis --- I see you guys can't decide on whether to revert or not, but in the meantime, there is a fix for build breakage. Please don't reply with something like "we can't push until we finish bikeshedding over reverting or not". Quite a lot of people build without avdevice. --- fftools/cmdutils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 0b06ccc..4f482d6 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -1281,9 +1281,11 @@ static int show_formats_devices(void *optctx, const char *opt, const char *arg, } } while(0) x(av_muxer_iterate, ofmt, muxdemuxers != SHOW_DEMUXERS && !device_only); - x(av_outdev_iterate, ofmt, muxdemuxers != SHOW_DEMUXERS); x(av_demuxer_iterate, ifmt, muxdemuxers != SHOW_MUXERS && !device_only); +#if CONFIG_AVDEVICE + x(av_outdev_iterate, ofmt, muxdemuxers != SHOW_DEMUXERS); x(av_indev_iterate, ifmt, muxdemuxers != SHOW_MUXERS); +#endif #undef x if (!name) break;