From patchwork Sat Sep 9 16:24:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilia X-Patchwork-Id: 5065 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp1347021jaa; Sat, 9 Sep 2017 09:31:33 -0700 (PDT) X-Received: by 10.223.159.77 with SMTP id f13mr4570808wrg.154.1504974693772; Sat, 09 Sep 2017 09:31:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504974693; cv=none; d=google.com; s=arc-20160816; b=arzEj+JuaG9Joaa91z/sOPNKrggntvB8EMtaO/ynXduJYMOhK4mml8nw8HQL8bRU2p uFYqyhOctPq0H/xmyN6e1pV6XsEQELAAwceibGcyWAL9tymZuU5+Cne8YXoSGofcK+d3 w+zv8JkFIURqhrN7XVEZOPPNzLT29cFBIDD3kFgn3NwBDrjTYGesEW6F7e5Y6gRP5P9k kv2Q/J3v5QHuh9uxARDUioHrk0u5fLCxbOofxm4BlcECD+kFA9BVOnLOZ2v9PrkimcBr EDgM+FwmSk4W31OHFZzc1gNYdj6FG1pgszbzXV6PIhAUcvYdhsDaiMho7kW6GcuMwf3b vrCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:to:message-id:date:from:references:in-reply-to :mime-version:dkim-signature:delivered-to:arc-authentication-results; bh=jrYtWw1hSpAchzyR1TTpRBI0g1QmZp8KUOrvhNcs/RU=; b=hioa+cQYIbEPMdumG6RoMaPvoASMtRAjsyFbSFjbK3eTZu3+Y6258FP9wyVOYXcYMg KIrRyol9jeEEDL/C5c/2233YbyTpzFsJfs0yEXQSss4S1XiWVg1fpOEigs5wSXLaAahv a6yx0cv5Z4SLC56/X9HBff8LEHZi7nbVOBODITrhwmCFf1+FKgROcg8z2WjBkdGb/Zeb ZwgTl7bwCagqf6e5TLtN2Gcbk8wN1MjLVlh3dZXLTCXleYFkTPxusx9NCffjiwAASzou i0TD5/E8EGZoBGiN3h+qrwE3NwM6oQ6AMo5SZoi+tglzIW6nc6/Mmmk4Tfd3HPl5+e9a 4KNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Qk2EkTFe; 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=NONE 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 p15si3674571wrc.164.2017.09.09.09.31.33; Sat, 09 Sep 2017 09:31:33 -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=Qk2EkTFe; 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=NONE 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 85259689B53; Sat, 9 Sep 2017 19:31:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua0-f179.google.com (mail-ua0-f179.google.com [209.85.217.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 858E7689B3A for ; Sat, 9 Sep 2017 19:31:21 +0300 (EEST) Received: by mail-ua0-f179.google.com with SMTP id l24so7206017uaa.5 for ; Sat, 09 Sep 2017 09:31:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=hlOakOgPHlpgXQ1Mv+yOcjFQ4ybgcGyzx92Eqf4fy6w=; b=Qk2EkTFexvrlWSB3tAVfUFlhW1uOU8zrz/gpIt9hSg7zEvS0MrJRWmctPlnZKRL2j4 sDJZNUZes844ZiP+4ljkaKLwNInewamcaMWErdLzIQ2xWGmEE7YN6t3PtMYo7/+vRIM7 nT4iE4gjUXiAnrKF8MruEwQrRGeKRv6HA3uUcMHx/LpIBPhwZcIM9+LWMP1TSyAZABeB hvUxyKRK3seendaVJNWRzFVR8Ym6RayZ964H/V3pa9acOfRhuTu0bW6FPBSvCgFvQ7To kAfjGI7jtNdXgfxBzU0Q6GFWdB8Ic/iAyPOgi761qkK4+6H/xT05Sq0CUS3rnQWBtTwE mbhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=hlOakOgPHlpgXQ1Mv+yOcjFQ4ybgcGyzx92Eqf4fy6w=; b=Zyc7ivdZMBOOYrUWf3wptA63eJ3nrweaHJZqlKmr/vvzBNr2ukT9y9BrLO4Ed10eRK McqMADfhe3IknypycdCSAjCIVB6qJzWTu8NF3kiiUos8J+EczLaaNQASnfJJmxA/LJ18 8WSi8QCdUERMaUxUaMzMGLRwfEHZv10xL3+Lg7vVfPXuo2XXu9zliNtKY0UxXi7aVOtu 47wLDtJDZ5K+pmosoVJx7Q3L/umdaN2vmXx/erfagYMMlLNjxxmxvyncmb8uO0zdGXEM nejgVbwfJh5UDyFf18Gv5qw/skivZsPuqM6L39//v9Ou+pIXsc6WIhsjRDdHZ2IM8sx9 sZxw== X-Gm-Message-State: AHPjjUh+okL6zJtU4asmDenhBMCfiDCd6mOaWIst24XWhQFeHKzDdtde E4x/kEBWlH00HTP33tbDQkrNQldF3LmE X-Google-Smtp-Source: AOwi7QB9v8ITUT/HoqmuhulDJ+TtffysIhGSwZlgkM1cO10mipp30/zlbPgU2sr8JPIfEi3cRjrCgKxqEyAJ39zP/+c= X-Received: by 10.176.78.23 with SMTP id g23mr4783089uah.9.1504974253416; Sat, 09 Sep 2017 09:24:13 -0700 (PDT) MIME-Version: 1.0 Received: by 10.176.71.92 with HTTP; Sat, 9 Sep 2017 09:24:12 -0700 (PDT) In-Reply-To: <1504973581-1540-1-git-send-email-rsbultje@gmail.com> References: <1504973581-1540-1-git-send-email-rsbultje@gmail.com> From: gh0st Date: Sat, 9 Sep 2017 23:24:12 +0700 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [FFmpeg-devel] [PATCH] vp9: fix compilation with threading disabled. 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" This also fixes the warning. --- libavcodec/vp9.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) static void vp9_await_tile_progress(VP9Context *s, int field, int n) {} @@ -1599,7 +1599,7 @@ FF_ENABLE_DEPRECATION_WARNINGS s->td[i].uveob[1] = s->td[i].uveob_base[1]; } - if (avctx->active_thread_type == FF_THREAD_SLICE) { + if (HAVE_THREADS && avctx->active_thread_type == FF_THREAD_SLICE) { int tile_row, tile_col; assert(!pass); diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index a71045e..f940d60 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -88,7 +88,7 @@ static void vp9_await_tile_progress(VP9Context *s, int field, int n) { pthread_mutex_unlock(&s->progress_mutex); } #else -static void vp9_free_entries(VP9Context *s) {} +static void vp9_free_entries(AVCodecContext *avctx) {} static int vp9_alloc_entries(AVCodecContext *avctx, int n) { return 0; } static void vp9_report_tile_progress(VP9Context *s, int field, int n) {}