From patchwork Tue Oct 11 15:50:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 957 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp12239vsd; Tue, 11 Oct 2016 09:03:04 -0700 (PDT) X-Received: by 10.194.80.74 with SMTP id p10mr5876889wjx.121.1476201784859; Tue, 11 Oct 2016 09:03:04 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id op1si5633168wjc.291.2016.10.11.09.03.04; Tue, 11 Oct 2016 09:03:04 -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=@googlemail.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; dmarc=fail (p=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 84AA3689ADA; Tue, 11 Oct 2016 19:03:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7FDCF689918 for ; Tue, 11 Oct 2016 19:02:56 +0300 (EEST) Received: by mail-lf0-f67.google.com with SMTP id l131so1809436lfl.0 for ; Tue, 11 Oct 2016 09:02:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=rwNXKuXeZdKEhVg0/1hOTgqomZafMUOdXnfggyVHR18=; b=Cl7iVzxWZpeDeWVMIThE3qiqKQwv91TzlQJjyCelMi7+3haxg02hY4vxk8X4yLEnQc /dMRyFaHfBdjSuFCrJyy9Z0bpoLC7hQCN+t2T8iccRWFQXznz6kIho52DRVbL95bGkYu u3NE7lfnjscgSkiJXh5o5WYz/s4F00PeC7/sWBkcG2qS0QurEK7ezzL4mzyz2+lvE4RX iNg5kB8bVlWsD4tpKXTHsIf5Pys58H0Vz4wpuuJ+tkLSSvtiB/m0ATxde8p+vC11PX33 c42yZNDL7ojGjtjrsGMc8ORQ10H5pOAvHU8uLdYMtqjzkzUlgXi/ektGABVH5TjffyiQ QMug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=rwNXKuXeZdKEhVg0/1hOTgqomZafMUOdXnfggyVHR18=; b=e+foA42MqoPm7Axto9S/K3RrL35gOL4qahuxqcWIk+jBL6Sr6G/BxP6DyMEBCWoqBw lSsevQ9cV9xcNz9azVCqxywXOxhvVSthm1KvAA8W/GPcGcfH0bxjUDXKMeUGO7nE3gTW e1fxFHnudyQsOQCGWicHjY0it3VXIsi94oT8rPmjABpnvVBwcwMukHtm6Roq6XfD8oKN V2P/sXR6JMUnBjnsmarO6rSGzR+tL4MMm0+0t6nmNU4n3f6AtmFEe0mMQqRwPeQbYX6A HKxDwJluRVForkZ+/m6GoJVkI0pr6KZtey38K79QU3RK+x1aRaPSG8WbuBjloxhCkxAO po8Q== X-Gm-Message-State: AA6/9Rk27Qibfy9+UeVjEvPGoaTASyI2oSaVPhyY0ITIkZdy0hhISt+FsZD4K4//mhUcCg== X-Received: by 10.25.38.146 with SMTP id m140mr3675139lfm.110.1476201003004; Tue, 11 Oct 2016 08:50:03 -0700 (PDT) Received: from [192.168.2.21] (p5B095A9A.dip0.t-ipconnect.de. [91.9.90.154]) by smtp.googlemail.com with ESMTPSA id y7sm1235535lfd.18.2016.10.11.08.50.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Oct 2016 08:50:02 -0700 (PDT) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: Date: Tue, 11 Oct 2016 17:50:01 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libopenjpeg: do not define OPJ_STATIC for shared builds 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" Setting OPJ_STATIC when building shared libraries with openjpeg 2 causes the openjpeg symbols to have visibility hidden and the final linker step to fail due to undefined references. Signed-off-by: Andreas Cadhalpun --- libavcodec/libopenjpegdec.c | 3 +++ libavcodec/libopenjpegenc.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c index 65167e6..1f8dadf 100644 --- a/libavcodec/libopenjpegdec.c +++ b/libavcodec/libopenjpegdec.c @@ -24,7 +24,10 @@ * JPEG 2000 decoder using libopenjpeg */ +#include "config.h" +#if !CONFIG_SHARED #define OPJ_STATIC +#endif #include "libavutil/common.h" #include "libavutil/imgutils.h" diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c index 1443551..023fdf4 100644 --- a/libavcodec/libopenjpegenc.c +++ b/libavcodec/libopenjpegenc.c @@ -24,7 +24,10 @@ * JPEG 2000 encoder using libopenjpeg */ +#include "config.h" +#if !CONFIG_SHARED #define OPJ_STATIC +#endif #include "libavutil/avassert.h" #include "libavutil/common.h"