From patchwork Mon Feb 14 19:39:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34287 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp5803872nkb; Mon, 14 Feb 2022 11:46:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJy5ajAPXP0vXlddTPV9FR4ZZCQ8n6Q2uRx+/tPF73eSS8LXniDOHbn1ZSafe8SfmnVkYFwb X-Received: by 2002:a17:906:3f45:: with SMTP id f5mr263445ejj.479.1644867979076; Mon, 14 Feb 2022 11:46:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644867979; cv=none; d=google.com; s=arc-20160816; b=tKxY0/iXON+QiiNwq/5KmW/3kqBHC9iE18TqV+l8zy9o9XwxAVCQZ0ZmTkSmYB22Mz Es8hI/gUkgWwaz1qPh83ch9W26U3dlWrjfn7UPEuWZp+xBceWNzNLgXhuyupVfjwTcml D4HkK2t4ap5L8CfXOx5q4rCfGHQDaJV4bxa1C5fTQWw96TkpWQK0Zh/kpTnp9RqH/Vt5 fqSa9gKIqjSbxrVz6H2MiNHPTzSkKVrsIiWidTX4U0NSAxNJoj+z2XdVt3T8AseNpCqg opkCHKEhjKKx0GNfQuZgY6nD7g9dfOXMeW/S+kMxGMp+35xdc4PRKnetwO+r1ne4Vntj 0Aow== 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:references:in-reply-to:message-id:date :to:from:delivered-to; bh=Wi5REK6B85zE//1YdwWLRQ2u4XSXk3KjKf4C0wE+TOI=; b=dFFVpHhiO6Qcme189jbnBwWbWs6HDagT2b4uNm37pHlFoqujVSgmhzUCA/tYVjmalz mDCObhba5gnD2iMSsv5p4oVTfih4oUSjIkOTOrzO/mZ2LaqHnrl6cOgvdEHVK1iXu4Qy Ec9BGzzFTIBa+vZE5vvFyz6sug5P/SrOk7ydh5yAxoAtX+Ee2x/UhfWAVaxtE23pqGqd mYghe7Nh05lY8kbb+GU2kbzxuyvrK8UCZT89o0mCGuNMssTBdGRGpV0Oy5csiA82MK2l XqAGAY1dDv8VV5eRtCTL+51iHBiv80ewOy6HvnP1TP42QaKekAzN/QKJaF6HME/95knf TlXw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hz5si22383185ejc.689.2022.02.14.11.46.18; Mon, 14 Feb 2022 11:46:19 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D69CB68B1CE; Mon, 14 Feb 2022 21:46:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe05-1.mx.upcmail.net [84.116.36.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77F5A68B1C7 for ; Mon, 14 Feb 2022 21:46:01 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nJhD9-00ExfG-0E for ffmpeg-devel@ffmpeg.org; Mon, 14 Feb 2022 20:40:35 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id JhCBn3LXASgGFJhCBn788g; Mon, 14 Feb 2022 20:39:35 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=f8Q2+96M c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=4qkO0-IAiEMN-s4Q6LYA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 14 Feb 2022 20:39:32 +0100 Message-Id: <20220214193934.22315-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220214193934.22315-1-michael@niedermayer.cc> References: <20220214193934.22315-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfJxsN5mlII1NjujWZeJ+PVELYUNGssyeAaCYx45Cu7wpsQohXB62yYf0HkzoTerI8dxZqO7RqjR4wXhNgdaUX2QSB2TpSsn1R1vQD70Bwso4QKJ92nFj 5j+TvTqRSVr0UT/v7uSAD+0to3MfqSSN6XYq/dtTTnIXcwXhjo4pa+yh Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/movtextdec: add () to CMP() macro to avoid unexpected behavior X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: VtqIIRtq55EO Signed-off-by: Michael Niedermayer --- libavcodec/movtextdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index 825632ca9b..dc30fdc698 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -263,7 +263,7 @@ static int decode_hclr(const uint8_t *tsmb, MovTextContext *m, uint64_t size) static int styles_equivalent(const StyleBox *a, const StyleBox *b) { -#define CMP(field) a->field == b->field +#define CMP(field) ((a)->field == (b)->field) return CMP(bold) && CMP(italic) && CMP(underline) && CMP(color) && CMP(alpha) && CMP(fontsize) && CMP(font_id); #undef CMP