From patchwork Wed May 22 10:38:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 13247 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 38C64448ED6 for ; Wed, 22 May 2019 13:45:48 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0DD736803EF; Wed, 22 May 2019 13:45:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 78FB868050E for ; Wed, 22 May 2019 13:45:41 +0300 (EEST) Received: by mail-ed1-f68.google.com with SMTP id f37so3110026edb.13 for ; Wed, 22 May 2019 03:45:41 -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:mime-version :content-transfer-encoding; bh=uhpmRtTD67jWODJGyzf+ZVBG0KvgYrOTFgH00S1S5QE=; b=WO1BC7GqOssEMmrR5sMYiVSEdccMg6auC1Um6HbJS8FVZTBj7y5YllL3hVJOyNAkmV lAiTyCrKfTt+3QCTvo1ujpRXoKA6tqOYx4fqyQGKKESAFD3fReIKT6pEzr3FOg9veCyU JBFuaYfiS/drCajSEonpz7vzwYJpI0Lh1yro9blzf+9rroIFJz68Ahap6CYGIDx7aBLo vLJ0NWhyaru1/htlTPjlk7gaJHESm4qgmYtjIay+Hms8wdSNZxEARP6tFxBuJ2rKhM/2 rQZXln+OHtY/dUfj04NgZqTcx3NwZajOJHRc2yDdXpCGnt1GSbUa0DirLCjBO+s5a5TN iZ4w== 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:mime-version :content-transfer-encoding; bh=uhpmRtTD67jWODJGyzf+ZVBG0KvgYrOTFgH00S1S5QE=; b=URmDVvfHxIRr0nLjBH4d9On+imRYCusCZ8FE0K3pbDGURY8rsFIpvvN0/0GstOHMft IaHZXeL8GImJfRHgd5XKBsUh717k4bZtC4Z8TsDk/kyh/+Og+Dntyi0ZzEmWCu+fWh+i rDUswXIe1jywLJ3QI4odxABO/swVDzlB3xZUMKeIRCIv6jym/ydRF7TBHKEKPJqbnjI+ THKZ3A7BqtskgIDdbMvcFcdV43Gbcblj8KUUhAbAPU2ICGcHjxruEkLbKC3pus8WeDV9 tvZRjXkWSzsunxBQP+5+WA15nOkq+Bfi4RscIq3SBHqOImAApqlvwJT5E2wISr2wxnHs S9Dg== X-Gm-Message-State: APjAAAUfsmuXVhP3YwdS8mWh90ejGL6RRIuZSceY+gObm2/Xfz/G5IrV RAFhGLzEVivV4rUmyl1+j5qJi2dD X-Google-Smtp-Source: APXvYqxirfudbg3bxGaBUFcfTMxX7uNruaqOQ+fCrEz+zEbqDcGLBMasMZ3S1FlEK0KDuUJpGS0jsA== X-Received: by 2002:a50:8163:: with SMTP id 90mr89238773edc.208.1558521495462; Wed, 22 May 2019 03:38:15 -0700 (PDT) Received: from Marvins-MacBook-Pro.local.kdab.com ([185.28.184.2]) by smtp.gmail.com with ESMTPSA id f13sm3953771ejj.7.2019.05.22.03.38.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 May 2019 03:38:14 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 May 2019 12:38:06 +0200 Message-Id: <20190522103806.12935-1-epirat07@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavu/time.c: Fix check for clock_gettime 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: Marvin Scholz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" According to the documentation [1] when checking for a symbol it should be explicitly checked against NULL and the function pointer dereferenced. [1] https://developer.apple.com/library/archive/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/WeakLinking.html#//apple_ref/doc/uid/20002378-106633 --- libavutil/time.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/time.c b/libavutil/time.c index afa6658aa6..42a7c1792f 100644 --- a/libavutil/time.c +++ b/libavutil/time.c @@ -57,7 +57,7 @@ int64_t av_gettime_relative(void) { #if HAVE_CLOCK_GETTIME && defined(CLOCK_MONOTONIC) #ifdef __APPLE__ - if (clock_gettime) + if (&clock_gettime != NULL) #endif { struct timespec ts; @@ -72,7 +72,7 @@ int av_gettime_relative_is_monotonic(void) { #if HAVE_CLOCK_GETTIME && defined(CLOCK_MONOTONIC) #ifdef __APPLE__ - if (!clock_gettime) + if (&clock_gettime == NULL) return 0; #endif return 1;