From patchwork Sat Sep 9 16:13:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ronald S. Bultje" X-Patchwork-Id: 5064 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp1335204jaa; Sat, 9 Sep 2017 09:13:22 -0700 (PDT) X-Received: by 10.223.196.228 with SMTP id o33mr4657300wrf.253.1504973602857; Sat, 09 Sep 2017 09:13:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504973602; cv=none; d=google.com; s=arc-20160816; b=jblIBOvXC21Kzn59K0z0GPEKvM9sHLCKvKwdEojdYM5AIQvK1eS3affl95FEwro+YP oxLQRGb7LH4hoUY+RZUe7NIASp11X890Oxl8FxZB5nQSa9HC5Xw8jX8GnW6xsNGkip+b 5hyK6V/DFtrKrb6rV/5QB8Z/3ZIYeBfj6kfUQmRywkutNEJZLtM6vakWKz9Z5THTIhlI GC/pJIJPgtvRFLBMvW2m/PZVsE2Cf4ys6KQoKcUL4RRHvq7FOzkpSDUEXYuCsN+miRv/ EBjIuu7UzaGFETt/xSMtHwLIqPyHzql7ldI6fIsCtwe2vhjiVCzsQawy8+eyKQNLS9AF LzHg== 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:cc: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=DTaaWSBvuv4tCsSxvDQIdYDGntx2v1lxzKOF/lLtl/4=; b=R0rx+gbwsRB7+myPdtQdeG/LH12sMjUq2vWq50TSfGfX2ZoHY7mZDE0bOjUjB0dG5a fYXLua2fnKLinQz68Imd8O2mZIpOTEUvpWpWZroSox/4x5dEP7mX7LxTi0ksbZ8hnfgT A/nZBo/lJl7AHE9Nu7wct2LUJEsIDTTB2WWwk+cs+JZM+pKAt8KLxJyh6wdXs39Yul81 7qpCiTBOwxAz2OycKQ6yuC+slUPiD7h+KC6rf4fb+VQ2XgXjiePysg6TVkXp7bMTOwLc 2/ltwNggy1BStyTcmAIiZ14JFffcFjPIHPuddBugsEjBQPm5O3G70v73ySxM3zEyCv6B DWCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=CVg1eflU; 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 h11si3666093wrf.399.2017.09.09.09.13.20; Sat, 09 Sep 2017 09:13:22 -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=CVg1eflU; 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 6519E689ADA; Sat, 9 Sep 2017 19:13:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f179.google.com (mail-qk0-f179.google.com [209.85.220.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A4776689A28 for ; Sat, 9 Sep 2017 19:13:05 +0300 (EEST) Received: by mail-qk0-f179.google.com with SMTP id b82so12016993qkc.4 for ; Sat, 09 Sep 2017 09:13:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=xgZGy/PU504xlGi3ftg3rvzGpMpymrN3gXZSt+Ku40Q=; b=CVg1eflUmN4hFx+t1rKvZNXS87oaJAYR+c7lUTgqXYrg0VEK4PDvpmvF3VVWBDJgAk hhg8K9wIJDyvpqh1pVAAXGIs4q08ZBhd4aYI4+SZWFcoVmisk56vGHisBkK4Mwc0Bzgz ZLgKjCfETJAOgNeoT/o2Rg33m39yUWLI14j4lmD0RYCweMfr2SQ95oMZ3cJ0rFuSS5Q2 HVpa92x6wiZSZlzTYb2XuTmRwmW0Pd+1rYfk/6LkCiuyEzvExRWrjZvKf+H4aZCu3Nvw lUi/IIEsOlSrTJTQ2Lzobun3qwZ4XNe3++IE96IFpqy+TYQIx3WjGIN7xqo2f+XjR0Pz HKGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=xgZGy/PU504xlGi3ftg3rvzGpMpymrN3gXZSt+Ku40Q=; b=HmWN+sEk//auxgSZfRShq50qNQuS4JpRoggazpP60Eq6arLoJtQ2+y/vl2Ch8G1974 rqeFLFAm4HnKU4dfvwcXieXISNgvmYAwslVux+eIXioA1y+9wSVA0O9WvsJii18JbjwJ LfervAmICOOn53FnfA08s5HQoljZThkttTVeBDijQWQ4ESY80dXqE0vJbadsc2RzuDzw DmyYCmLOBFavftC/ljfW0hvnpDcqJCdb6Yn0jritnQWKVOWcfUwOfxRpfEoZrPdkqRgk Jtem4L6V1tq6rxueQ4VAJZI3T5QBQIWJyZhVQwhLB64Kp0XwIeCTsTJHv7Am8QFjtvPb 3gUg== X-Gm-Message-State: AHPjjUiduSV3X+gV4yO+U9NPJIJLCj1btiyMQfyyMfJUSumIB/woD8SU x3FrrU483kky+hT2DqM= X-Google-Smtp-Source: AOwi7QAxzvNv64AfUG46vGEVWw0SOl6Or82kRul6Sm9RzgFAzzLcSTVO5IRKimCEQessd+vfScfJoA== X-Received: by 10.55.43.234 with SMTP id r103mr8822764qkr.334.1504973588801; Sat, 09 Sep 2017 09:13:08 -0700 (PDT) Received: from Macintosh-7.home (pool-173-77-254-54.nycmny.fios.verizon.net. [173.77.254.54]) by smtp.gmail.com with ESMTPSA id k20sm3006098qtj.2.2017.09.09.09.13.06 (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 09 Sep 2017 09:13:07 -0700 (PDT) From: "Ronald S. Bultje" To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 Sep 2017 12:13:01 -0400 Message-Id: <1504973581-1540-1-git-send-email-rsbultje@gmail.com> X-Mailer: git-send-email 2.8.1 Subject: [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 Cc: "Ronald S. Bultje" MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/vp9.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index a71045e..499f357 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -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);