From patchwork Sat Jun 2 16:07:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 9228 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp2069562jad; Sat, 2 Jun 2018 09:15:36 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLuoYPBZAoSZXzUWJggHmz32KyuRMJtXNEpPhVopJq+csp8OG9v1PZqc7nNy1hNetvbu5Fb X-Received: by 2002:adf:f7cf:: with SMTP id a15-v6mr11421866wrq.108.1527956136172; Sat, 02 Jun 2018 09:15:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527956136; cv=none; d=google.com; s=arc-20160816; b=ADFAKuYuJCoTyXcxHZ0ub1U2uZAg+9HiHnzaSxAiUsrRI3VywdsIn4Vq8u7/YPzlTj o6pktVYKdNAsEsNx/s1E1zHEr15iTdwEDNnR9D6t5b0g2q5+YiEeOipJPjaCdbDoFUAT zMRBW6PHdM8oz5U7nVl8EciMnEnO5P/p3Eeb0rNEruVw0qXuUsIiYV81VIdGE7KIhp8x BQUtXkoCuMEZDS7I6y2AEX6FhIJNRrTGFdx19HaO48Ez40g0UzJkR35I0Qn7ZFN3o1/G 0Y4TzXdIjUa9BJIk8XFRR0IW0zFBOB+Q7ouX2oYChFlRv1Fjz4T57lKdZ9yN+wNeDIN6 w3fg== 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=ta0kZLwjPMNddpEloq9LNrLm3w9P8hNnoa5WIz1bk4U=; b=hh+6Zx1/qRP/p8FizxNtTDeaBdO/BRBhY/grxaBecqjY6wN2XItvNL8Yz3NV4C7Nso hsTmrttALlUEOGGlupU/K+HHyfoCytFBDDnU6Rc0Rtl6ComZ0/8kfIv8UnQsnFoCcLGz NFs5ZaKPV9WNz+UDNM8ZkHEb2PSeHh4QyvO2swfAk/3216UCKDtg3ichXvM6QRujOdEn F5fRykX/pZ4FBtILWghwJ9XFZ94H6PVc9NfqYPosIFFxTaidkKjDahP1heciKy3nJqeX oICLCfYgQvowyJgJwgZRfJP/z8eoA4MwXYb+9SUS/SSO+qJJ5VNtSACe9lmidFwZtR9d d91Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=gEyCoAbl; 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 s193-v6si3512841wmd.230.2018.06.02.09.15.35; Sat, 02 Jun 2018 09:15:36 -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=gEyCoAbl; 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 ABD3568A056; Sat, 2 Jun 2018 19:14:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F81D689AEC for ; Sat, 2 Jun 2018 19:14:41 +0300 (EEST) Received: by mail-lf0-f67.google.com with SMTP id j13-v6so14649458lfb.13 for ; Sat, 02 Jun 2018 09:15:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=hYGUaOkHGM/ZlN/VlJV0rjDscU0NRkbzYoZgF5zvfn8=; b=gEyCoAblrFpmw96S2Id8XbB4xM2P5oTmii2O8PbXaBUGk6IH7Nbn8ky5kAmE3gRXlG tyCZXLI5MPTiozqYe+jFx8+tIQMnTnD92oh0KZ0MgDRgsL3Nsa3WHgv8Y33Ggkn+KdHg 6pvxM3gEalmnXczUlDBa3ugxFbXaUiqur+meJpTPaC2WZnW7p1Sn02OSzJO3R5XItHjt I2Nl6qdZPshVw+rajGJgr9N439j9uf41PVL0t5ZHZqiGXZnXyIaDAEAEf8VwCxlCKbL/ MDF78Cv/3k+MgsYtyE2RTEALYWrstFXMNkslQP0tQwQRUdFgbkqPREOWegZO/L6wqKXn lYmg== 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=hYGUaOkHGM/ZlN/VlJV0rjDscU0NRkbzYoZgF5zvfn8=; b=m4TDt8bpgLQQ46v5WGscMXzkp5RdUfR1t91ZpjMLOx7FcLQJcE/GtdNacYY7BZ3M4v 2Qlie4TKUbV56KuCkyFud5XrRCpNHIGkSLpe522BD0KrILhTB2QlhDilcfSNxpgv9tqp A1MNHVAOAu0WFb9avr+35DP53JX6HEG/OOd7+WqXqa76WA3bPBdqcZQbJnaByX0UUyuK aeObOT/yFR1CCj5yzsrZyqGbwmiYl7Z4R831IUFm5d7IheHNjMbDkTyxy2/gnJ+p8vJC dZKgJk9MLKCqC7bsWd47hEwrsQUZRUHa0PksrIBe9woSCzGsQOLRcA289q8MFlYin1k3 JpjA== X-Gm-Message-State: APt69E39KSnRYrunODwD9cWijJQrNzCEKpxo26eQ8DqkD1267w1pGA+l iz+9WDKccRIF7SivXzjDlKuDn2xD X-Received: by 2002:a2e:9a44:: with SMTP id k4-v6mr2801392ljj.17.1527955661280; Sat, 02 Jun 2018 09:07:41 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id l7-v6sm4672838ljh.53.2018.06.02.09.07.39 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 02 Jun 2018 09:07:40 -0700 (PDT) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Jun 2018 19:07:38 +0300 Message-Id: <20180602160738.8526-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] lavfi/Makefile: move dnn_*.o under vf_srcnn 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" These files depend on libavformat, and the vf_srcnn filter currently is the only thing utilizing these dnn_* files and already happens to have a dependency on libavformat. This fixes compilation in cases where libavformat is not a dependency for libavfilter. Reported by Kam_ on IRC. --- libavfilter/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 5bacd5b621..4303e80097 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -12,8 +12,6 @@ OBJS = allfilters.o \ avfiltergraph.o \ buffersink.o \ buffersrc.o \ - dnn_interface.o \ - dnn_backend_native.o \ drawutils.o \ fifo.o \ formats.o \ @@ -338,7 +336,7 @@ OBJS-$(CONFIG_SMARTBLUR_FILTER) += vf_smartblur.o OBJS-$(CONFIG_SOBEL_FILTER) += vf_convolution.o OBJS-$(CONFIG_SPLIT_FILTER) += split.o OBJS-$(CONFIG_SPP_FILTER) += vf_spp.o -OBJS-$(CONFIG_SRCNN_FILTER) += vf_srcnn.o +OBJS-$(CONFIG_SRCNN_FILTER) += vf_srcnn.o dnn_interface.o dnn_backend_native.o OBJS-$(CONFIG_SSIM_FILTER) += vf_ssim.o framesync.o OBJS-$(CONFIG_STEREO3D_FILTER) += vf_stereo3d.o OBJS-$(CONFIG_STREAMSELECT_FILTER) += f_streamselect.o framesync.o