From patchwork Tue Apr 7 00:38:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 18739 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id E58064499F0 for ; Tue, 7 Apr 2020 03:46:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BAB0868B588; Tue, 7 Apr 2020 03:46:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f68.google.com (mail-vs1-f68.google.com [209.85.217.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 65E1068B53B for ; Tue, 7 Apr 2020 03:46:30 +0300 (EEST) Received: by mail-vs1-f68.google.com with SMTP id z125so1098667vsb.13 for ; Mon, 06 Apr 2020 17:46:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=3loUmX29z4IyU+8i2givCxnuAZGKqT+iTKLkVMs7NQE=; b=ICz9x5aGMPyA9q+a3pA/aSTsPE7N5nORJbIWC0MwdLZ235d9MyyI644n/4Ot5q3LWj JPOY2lmX5sDyLQF0bOPDEbv33hiPHP4kqhRygaZvEKDN33ovrXQER9x60fn6FDR7HvvQ 3jM83G2I1vucTvgZjNEa031N4W8lCjZrRDu+FJoeB8EZe3OkkPb36L6kxK5o2ZnvKTna tiaQlZtzYKwCgk//B3ogKAj5UGUnZDQO0rsaCXkc954j5vqBWA31ZDtl6Idr7hYNCw8J va+TQi0FTaYv4kSjfJHrXoMn4N0JsrJ8GdZ5tt1c2qV9a++qq14V46nHFWS4fNsd5gRS mbgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=3loUmX29z4IyU+8i2givCxnuAZGKqT+iTKLkVMs7NQE=; b=K1FyrUjuknUF/mwsaxY7SkB9jhdYLEdjwZzJl+kApJevCv6l8lfbHPugtoGsuoM8N5 vrIb7lJK8rwUbNvPGBW11cFxDYH1jJ2g4sK/lgupdxWLh6zf3zwJEXem1xUQLVa7fDeS 8g0f3QNRoFM8W0GHblyDFZF77JkWVC3ZcmVAg4RBzk8AK2Ll1gjRNX/1LlcGhF9w2Y45 6syj2fp2+iJXw5uqUKO5fPHa2AJEQGrN2asdj8lJIOqqMeSLAmrlBucNm38SHX3ViDxG q+Y/PYvd6RiIX2q/s1L5mqKN9MCHuuQuQYxcYKyTMBY/rdbBR4Z/XliuOpmEhqrW5Yka 0mMQ== X-Gm-Message-State: AGi0PuYBrc+/7iP2groJwZxnLI1MLdL7p5tJLXFLAEO6PPeO0WgFual4 7WSRp7yHbc5Jf71ctZ+KXkJEXgM8 X-Google-Smtp-Source: APiQypIkPn/kF550sKEsPpVBary/072MXRmJo+c98U9fsGr7bIsaIRElsKVqhGP43eKQldOs5Dzbpg== X-Received: by 2002:a17:902:aa49:: with SMTP id c9mr23678986plr.145.1586219941070; Mon, 06 Apr 2020 17:39:01 -0700 (PDT) Received: from localhost.localdomain (astound-69-42-19-227.ca.astound.net. [69.42.19.227]) by smtp.gmail.com with ESMTPSA id g4sm12626028pfb.169.2020.04.06.17.39.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2020 17:39:00 -0700 (PDT) From: Rosen Penev To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Apr 2020 17:38:59 -0700 Message-Id: <20200407003859.117517-1-rosenp@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_drawtext: only test available exceptions 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" soft float systems do not define these macros under musl. Fixes: Ticket7102 Signed-off-by: Rosen Penev --- libavfilter/vf_drawtext.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 887a686d16..abe1ca6c35 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -1085,10 +1085,12 @@ static int func_eval_expr_int_format(AVFilterContext *ctx, AVBPrint *bp, feclearexcept(FE_ALL_EXCEPT); intval = res; +#if defined(FE_INVALID) && defined(FE_OVERFLOW) && defined(FE_UNDERFLOW) if ((ret = fetestexcept(FE_INVALID|FE_OVERFLOW|FE_UNDERFLOW))) { av_log(ctx, AV_LOG_ERROR, "Conversion of floating-point result to int failed. Control register: 0x%08x. Conversion result: %d\n", ret, intval); return AVERROR(EINVAL); } +#endif if (argc == 3) av_strlcatf(fmt_str, sizeof(fmt_str), "0%u", positions);