From patchwork Mon Sep 11 19:41:47 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: 5097 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp3455807jaa; Mon, 11 Sep 2017 12:42:01 -0700 (PDT) X-Received: by 10.223.164.74 with SMTP id e10mr10741309wra.19.1505158921244; Mon, 11 Sep 2017 12:42:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505158921; cv=none; d=google.com; s=arc-20160816; b=E1ZyohfpjYfhdo9NOrEt0OYJKIVaFmZNywUacwyBHNka3dD5ih5l6EwdaSudr5gD3y bwuMQsin1XLqp1TdmeXqfBojU351mYphQfzZEqFIJ5NDjmzT8DKcDFY6SfJYIkUmcefd qaxubG9nJ/NtVz6/eP38ir6teEvIHLkcGtC68viXpUWesBPxOAFpjImBOIr5krMTrTTM Yc3qHb2GBqd71v3KCMpuLGYZvWI3TnmFvfrJxpoDG2n5teu575Pt1u96vh0WaZi9bx8X XNH+fYPDhsa91BUcSE9AfIIXVCuVGw/+Ynld8mYU0aSd0O/0kGF6uhM2PwlJyTTiFn5Q Sg+A== 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=gQZacjvyTE62NPLKuRWs262zmnhuzmDOmuUk+BYbo40=; b=xb9Lo6l1vrgeL1mzT2q8aYHJXArO9oTMnW+UxeRvOU0deruDmC3sJ1q/9fK1EZpDoU 0U7h+p2O2RzVqgasje7WWJb8S1yXCYkx5EdO7BIsu0+xL7AWiQcNenTBTZ+H66pyGThS /SV0abV+gFRGdpAO0vDlLM+VbJi5YZdTZMKJXVoWQB2oQXIpEfQEqDYgogpvXaSt3ndS /F/S6USwSWq60+ZmmQ9YfzW34QeKQghTpMpKqoumo8kUq6Me7hT+w8KPnxj+26dj77z3 5OtrKE9i3UhAHdK+JNtFbba76Tgi6BaTuDdCYP7eg+ZbNLfkkbpqxFtzONo7m8WiAxKD qOXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=EksZREBf; 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 i70si7281133wmf.99.2017.09.11.12.42.00; Mon, 11 Sep 2017 12:42:01 -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=EksZREBf; 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 AE657689BA0; Mon, 11 Sep 2017 22:41:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f195.google.com (mail-qk0-f195.google.com [209.85.220.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8BA64688347 for ; Mon, 11 Sep 2017 22:41:46 +0300 (EEST) Received: by mail-qk0-f195.google.com with SMTP id c69so6012372qke.5 for ; Mon, 11 Sep 2017 12:41:52 -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=J73UaPJurs1qOLJhtulFmmtrfBmHxFzjF4rpd0On+Bw=; b=EksZREBfC/GF4930IHpZChIlOHpVkUMfJaFa3IBcGPAQztxcNMRB2CkD0gsF+OMCOe 99RVfQSW3OWzoZuY3VjKMNifXGhmHZyXOno7Pm9KeOO93eClRCpOtUJQexqWMLcT/2hs UPqIutPiYbj+OGv7RtjNges5QrWUhMJNK5itIr2WpkWiAzV/BiyRmsurbaWXJeSNR2Yf esiqdd+jOIsF35LSIR04ByVGXa3tyxoEN0I/0cJrCrfdAqa/Ygl2WTCyGXxwHyAHGIWi mFx06VJv4bBfT9W//uiILF23aNgvfvBcw3BkcBLSr3tqKMHnkpmBYB8qm6ExSLrNzm4J /tfA== 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=J73UaPJurs1qOLJhtulFmmtrfBmHxFzjF4rpd0On+Bw=; b=GULpWLunhDUqSSebs59UcpOS0qZ28stkJ57Fe2WVdGAuZhMHgideurrSzyhC4yU8CD 9sNjYOlGs+28CEVxUMlmSr5lX2sl10zeT1eJv73mrZz5ZwHMImTOwdTkUrAv/Ukx3aq8 TyfUY/ss+7ebcFaBR57QPet1jTdJZnJDFGmBm4I59LNSsgW7OMcEigW41GXn1/VHLGM+ U4HVZTxzVUASN91DbN4xw55ArcWtL+Guey8CoD+94LWz91mUYksxU4o9G4Cd9S0xXDEt JveZxvXnvGvZfIsOr4A8nvpCOcOdc8+kITGKZDnPiqE/45jrTrfXxiS31imVD9EK2Vws R8Gg== X-Gm-Message-State: AHPjjUgydZzTlCWd1u4+aCNejWixEbAXDz7JJGFEpanfBv5xBNfrd7aM 1f1T12gkFIBKN7775Ng= X-Google-Smtp-Source: AOwi7QDO4cQHHn1JuvI+HrM0EpXYbNACWbOyGo9vUfuwK7pdjDaBEI/JnnAL+ZDx7XuiRMaA8NTO+g== X-Received: by 10.55.4.141 with SMTP id 135mr12095041qke.86.1505158910599; Mon, 11 Sep 2017 12:41:50 -0700 (PDT) Received: from localhost.localdomain ([65.206.95.146]) by smtp.gmail.com with ESMTPSA id s141sm6455159qke.62.2017.09.11.12.41.48 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 11 Sep 2017 12:41:49 -0700 (PDT) From: "Ronald S. Bultje" To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Sep 2017 15:41:47 -0400 Message-Id: <1505158907-33193-1-git-send-email-rsbultje@gmail.com> X-Mailer: git-send-email 2.8.1 Subject: [FFmpeg-devel] [PATCH] vp9: assert -> av_assert and fix associated compile error. 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 f626f81..66ccb6c 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -1603,7 +1603,7 @@ FF_ENABLE_DEPRECATION_WARNINGS if (avctx->active_thread_type == FF_THREAD_SLICE) { int tile_row, tile_col; - assert(!pass); + av_assert1(!s->pass); for (tile_row = 0; tile_row < s->s.h.tiling.tile_rows; tile_row++) { for (tile_col = 0; tile_col < s->s.h.tiling.tile_cols; tile_col++) {