From patchwork Sat Mar 16 16:28:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 12326 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 E063B44902E for ; Sat, 16 Mar 2019 18:28:58 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B3BF6689C85; Sat, 16 Mar 2019 18:28:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from w4.tutanota.de (w4.tutanota.de [81.3.6.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D7F268829F for ; Sat, 16 Mar 2019 18:28:53 +0200 (EET) Received: from w2.tutanota.de (unknown [192.168.1.163]) by w4.tutanota.de (Postfix) with ESMTP id C96B310601EA for ; Sat, 16 Mar 2019 16:28:52 +0000 (UTC) Date: Sat, 16 Mar 2019 17:28:52 +0100 (CET) From: Lynne To: FFmpeg development discussions and patches Message-ID: In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] celt_pvq_init: only build when CONFIG_OPUS_ENCODER is enabled 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" The entire function was defined away before. From c547198da31bd748d5f9c9eddbe6bf3b1831fdfc Mon Sep 17 00:00:00 2001 From: Lynne Date: Fri, 15 Mar 2019 14:32:08 +0000 Subject: [PATCH 2/5] celt_pvq_init: only build when CONFIG_OPUS_ENCODER is enabled The entire function was defined away before. --- libavcodec/opus_pvq.c | 2 +- libavcodec/x86/Makefile | 1 - libavcodec/x86/celt_pvq_init.c | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/libavcodec/opus_pvq.c b/libavcodec/opus_pvq.c index c3119a03f1..9c21d67298 100644 --- a/libavcodec/opus_pvq.c +++ b/libavcodec/opus_pvq.c @@ -903,7 +903,7 @@ int av_cold ff_celt_pvq_init(CeltPVQ **pvq, int encode) s->pvq_search = ppp_pvq_search_c; s->quant_band = encode ? pvq_encode_band : pvq_decode_band; - if (ARCH_X86) + if (CONFIG_OPUS_ENCODER && ARCH_X86) ff_celt_pvq_init_x86(s); *pvq = s; diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 3bfba94ec2..2697431781 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -53,7 +53,6 @@ OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp.o OBJS-$(CONFIG_DCA_DECODER) += x86/dcadsp_init.o x86/synth_filter_init.o OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc_init.o OBJS-$(CONFIG_EXR_DECODER) += x86/exrdsp_init.o -OBJS-$(CONFIG_OPUS_DECODER) += x86/celt_pvq_init.o OBJS-$(CONFIG_OPUS_ENCODER) += x86/celt_pvq_init.o OBJS-$(CONFIG_HEVC_DECODER) += x86/hevcdsp_init.o OBJS-$(CONFIG_JPEG2000_DECODER) += x86/jpeg2000dsp_init.o diff --git a/libavcodec/x86/celt_pvq_init.c b/libavcodec/x86/celt_pvq_init.c index 3890a9cb9f..13724c3561 100644 --- a/libavcodec/x86/celt_pvq_init.c +++ b/libavcodec/x86/celt_pvq_init.c @@ -32,7 +32,6 @@ av_cold void ff_celt_pvq_init_x86(CeltPVQ *s) { int cpu_flags = av_get_cpu_flags(); -#if CONFIG_OPUS_ENCODER if (EXTERNAL_SSE2(cpu_flags)) s->pvq_search = ff_pvq_search_approx_sse2; @@ -41,5 +40,4 @@ av_cold void ff_celt_pvq_init_x86(CeltPVQ *s) if (EXTERNAL_AVX_FAST(cpu_flags)) s->pvq_search = ff_pvq_search_exact_avx; -#endif } -- 2.21.0