From patchwork Sat Oct 7 23:05:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 5453 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1095709jah; Sat, 7 Oct 2017 16:05:35 -0700 (PDT) X-Received: by 10.223.133.244 with SMTP id 49mr5169701wru.153.1507417535258; Sat, 07 Oct 2017 16:05:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507417535; cv=none; d=google.com; s=arc-20160816; b=UfYt14BLAmUnqm+yGm5UmnJh+N80kMNtAlzQMQ86H316b+W9MCE8NV35koOSPiusEl CqU2mnyKrQNSP/Q3yTokxCxMXygo0CKNbtJAcd9s+FJeFKFoWGvYR+Edu3Zf78lGPJtN fqZgitlINEynubmXnldrC4sXNj91Qxyx2Y7LrqwAQ2HBZG+WoQ3pkj6sobMiCyR5y1mR x8saGbWeBaJRvSAsLPdlx/16cawz3QQj/nAqHX2atzAKMPaB4ZdWhQ1kM/kvFf2e7M3E X+uUp0Z1k2OR3LY2/q2krDmLa2B2urTKls9Mgdzeu40e777hKdvXdcXaAUc9c+q8kin6 3QxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=usoWonkEYsaA6hl0foOvwK8r10+mkiUnza7hQYBqtUM=; b=oFhDFUASC0Wge+Q9pwA9d3pMJo6M7dmNDJbffbuHj26J1/dmpu3cL+acssTXto+EQF /9I4gXF5W1PRWISeGzkDFx7jRhKNeEETWOdMD7HPhDvgPXEbD9SLrmk2ULMds54w0RYN Kl7apbMHis/NufYTkQyOg/7gqh/eTs3m9IRRg6nFbtnl3CAQSizOOTPk5pliZhcShVaP Me6TQXDcxZ7jj/Q6VesA+a3DNeV8TJnGvMP3h3w0cgkwqwCTICTZszs45C54UxbVHpX3 apkNIgFV2tyiJzSz6envBwlKlz6vCdZh7b4xPyvZFPVdRBYEOKggfxdYs6KQOJvf/Kcv 9rnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=t8qlWlU4; 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 l2si4299077wrb.339.2017.10.07.16.05.34; Sat, 07 Oct 2017 16:05:35 -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=t8qlWlU4; 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 DDBA76898F0; Sun, 8 Oct 2017 02:05:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f169.google.com (mail-io0-f169.google.com [209.85.223.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0324F6818DB for ; Sun, 8 Oct 2017 02:05:26 +0300 (EEST) Received: by mail-io0-f169.google.com with SMTP id f202so3591660ioe.0 for ; Sat, 07 Oct 2017 16:05:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=XnEMZJfOprIrhZtJXZtvhi5viK/qQXDJGuBmqXiFK9o=; b=t8qlWlU4BMKpTJoLYB8SC6vzBlD3Ur0hvQUAZypzB2edfMLDLm6U142fws1WkMlUgQ E27oFvWXSeEhWcIminCry6mL7N5MVRQdi2mcyrLKvJlIJ/3AP7ahKzZdSBoJ2vtkASy4 vKI3azsUoD18W8VMc2ykCkeNYKP7LY5Pu+c9V69O9LzvZWp9s3bTIpTcSa6zkNKf3RZp WZH1VAJDFFLM/AvUpnle21Hvop5gT1RbswSrXRZJg3e1MOvCbiSf/4p+zjmDHUqTgJkG RBwMfYDlJbQcXUaLDCczD7/DkNuybJH4L1uIAQBFCtaQCkLw743j8x9hwF0ze0Otr1HS 1tWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=XnEMZJfOprIrhZtJXZtvhi5viK/qQXDJGuBmqXiFK9o=; b=A3TtkGflcT9KuMP8W5lyFoUrCShYNDFjxHYC090E6yFLDIJsmRn8f//ZAd9NecGO0I Ma04JndQEt/I5Q8/U2u5m4YWyl5bimdjiyiI89+7+v2tpPsTCv8Av1xUzxKEfD5tWscC y+xJRE+IoG3gxs9GtNQVQmRhgg/iRO6QzTp6AMp3sriDp3EcBZAIV/uo/+pyW8l+SxwZ NqTpfgxShGieiwgPHc4dlNUnfyxHIY9u6Qx+wlFvwr5pLXW3XNdPIap3bnsHp1VNkcqZ z6l4BuvAZl6KqGPlUILs34r7EKr8NkpQkCWsSR9Ws8LMdoFbcFuQ2Np0TWD1LMg0Rjt5 QA3g== X-Gm-Message-State: AMCzsaXEV1JXS16Mbk15BfPgezsSQXCEESaW9H+bPw1Q2OLJCjbjviDo S3MvTQ2NkLt7/o8SGdkMDivWF+YejOELl6f9gG3HuQ== X-Google-Smtp-Source: AOwi7QAuxmHc9Ixn8kKtFbqApz+n6Qmtp52agqYB7VCh5GKbQQ+nv61y3VQCzrfe88dJFz+/zXL/fklRJLvB4+iYJws= X-Received: by 10.107.168.215 with SMTP id e84mr7003743ioj.107.1507417525602; Sat, 07 Oct 2017 16:05:25 -0700 (PDT) MIME-Version: 1.0 Received: by 10.2.134.74 with HTTP; Sat, 7 Oct 2017 16:05:05 -0700 (PDT) From: Carl Eugen Hoyos Date: Sun, 8 Oct 2017 01:05:05 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavc/utvideo: Use "&" instead of "&&" in expressions with "~" 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" Hi! Attached patch silences two warnings when compiling with gcc-7: libavcodec/utvideodec.c:242:107: warning: ‘~’ on a boolean expression [-Wbool-operation] const int cmask = c->interlaced ? ~(1 + 2 * (!plane_no && c->avctx->pix_fmt == AV_PIX_FMT_YUV420P)) : ~(!plane_no && c->avctx->pix_fmt == AV_PIX_FMT_YUV420P); Please comment, Carl Eugen From 5fa1b443d1603d7d2d4860d43a7aefa7196c3cdb Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sun, 8 Oct 2017 01:02:01 +0200 Subject: [PATCH] lavc/utvideo: Use "&" instead of "&&" in expressions with "~". Silences two warnings with gcc-7: warning: "~" on a boolean expression --- libavcodec/utvideodec.c | 2 +- libavcodec/utvideoenc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c index 40c1277..101b3a6 100644 --- a/libavcodec/utvideodec.c +++ b/libavcodec/utvideodec.c @@ -239,7 +239,7 @@ static int decode_plane(UtvideoContext *c, int plane_no, VLC vlc; GetBitContext gb; int prev, fsym; - const int cmask = c->interlaced ? ~(1 + 2 * (!plane_no && c->avctx->pix_fmt == AV_PIX_FMT_YUV420P)) : ~(!plane_no && c->avctx->pix_fmt == AV_PIX_FMT_YUV420P); + const int cmask = c->interlaced ? ~(1 + 2 * (!plane_no && c->avctx->pix_fmt == AV_PIX_FMT_YUV420P)) : ~(!plane_no & c->avctx->pix_fmt == AV_PIX_FMT_YUV420P); if (build_huff(src, &vlc, &fsym)) { av_log(c->avctx, AV_LOG_ERROR, "Cannot build Huffman codes\n"); diff --git a/libavcodec/utvideoenc.c b/libavcodec/utvideoenc.c index 840742c..96607d8 100644 --- a/libavcodec/utvideoenc.c +++ b/libavcodec/utvideoenc.c @@ -409,7 +409,7 @@ static int encode_plane(AVCodecContext *avctx, uint8_t *src, HuffEntry he[256]; uint32_t offset = 0, slice_len = 0; - const int cmask = ~(!plane_no && avctx->pix_fmt == AV_PIX_FMT_YUV420P); + const int cmask = ~(!plane_no & avctx->pix_fmt == AV_PIX_FMT_YUV420P); int i, sstart, send = 0; int symbol; int ret; -- 1.7.10.4