From patchwork Sun Sep 25 10:56:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaolei Yu X-Patchwork-Id: 711 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp1407143vsd; Sun, 25 Sep 2016 03:57:14 -0700 (PDT) X-Received: by 10.28.97.69 with SMTP id v66mr9500294wmb.12.1474801034853; Sun, 25 Sep 2016 03:57:14 -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 vb6si15023127wjb.80.2016.09.25.03.57.13; Sun, 25 Sep 2016 03:57:14 -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=@gmail.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=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E57C5689DEF; Sun, 25 Sep 2016 13:56:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F30F2689B48 for ; Sun, 25 Sep 2016 13:56:46 +0300 (EEST) Received: by mail-qk0-f193.google.com with SMTP id b204so9897253qkc.1 for ; Sun, 25 Sep 2016 03:57:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding; bh=jTVWYBGYsLRA3P7NZuTbfH3D6g58kzBBmtnHvNjWiW4=; b=01fR470ofjhY7cUdRs+Upvc4I1R+asXSWgL0PcRgWKeP7W5+3LaqoS8OTM+eUlVPdn qzsXUMWpCVaAzvwwQohBmUzmjPyNpOUpXE8tHa9TlRzktDR7q+tzVd+m5O5CM8TJnJ9Q UFr9H71EwnTvQhjyMF1YGTxAe/rwoyT3Dszt9dhGPoViuV2hchWyURLOD6S4iJkEuh9k RHIXfswf9Gt0pufx7Zs+S+PDrQHVasifP9qI9oTHz6WxqbKghLE09XEPe4vi60KubN67 4e3/IVT8IGmiyhnCQjUE7Y9opAcMpZeBFQ9u+qcnsRvFzNGOegTqpyz56bSLR3gGR3ZY R2PA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=jTVWYBGYsLRA3P7NZuTbfH3D6g58kzBBmtnHvNjWiW4=; b=bwrDb+AzJb5tKVFB9Rlj/AWtaQuGAZxWWM9bTS8EruSwtAZ+tYssP7h+WEfkAbEtmR t2xWn5R0yYu1Dux2IAxfeORTAxjRe5x4xwVuRs8Rz4LlOCM+ECf6fsgx3w96PGUx/n1j eVPAldnjs6wGDM1cWh6W0QwwR44JWzQfvigq0AEAkRmI1xaN6wOglJQ33utKgT/zJpHa IYsBeRsr/QA3bVdHs/2agKaGUW9/RFvd5fYDz3Ga3g9CQbtEVELWeUemMwVDao+APmWu lCGAQ/wiz9nR9Wy9d0hETY+iZ8EcfdTS1kCrSx7Yprnn670yQ/uAh18PuuGb3UTJ5siz 0kwQ== X-Gm-Message-State: AA6/9Rkeib0/uM4dARyTO5wfUXL7Cu/T6uR9kohDx8KM8iAYp2RAi0N/NdhUmQF9uecmrA== X-Received: by 10.55.104.199 with SMTP id d190mr17151945qkc.163.1474801022278; Sun, 25 Sep 2016 03:57:02 -0700 (PDT) Received: from [0.0.0.0] (ec2-54-88-157-177.compute-1.amazonaws.com. [54.88.157.177]) by smtp.gmail.com with ESMTPSA id f62sm8792430qka.3.2016.09.25.03.56.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Sep 2016 03:57:01 -0700 (PDT) To: FFmpeg development discussions and patches References: <7783620b-5a1f-5179-3526-73143553bccd@gmail.com> From: Xiaolei Yu Message-ID: <0d06b7f5-47ba-fbd5-9005-4690b54d916b@gmail.com> Date: Sun, 25 Sep 2016 18:56:55 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.2.0 MIME-Version: 1.0 In-Reply-To: Subject: [FFmpeg-devel] [PATCH v2] avcodec: fix vc1dsp dependencies 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" --- libavcodec/aarch64/Makefile | 2 +- libavcodec/aarch64/h264cmc_neon.S | 2 +- libavcodec/arm/h264cmc_neon.S | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/aarch64/Makefile b/libavcodec/aarch64/Makefile index 36d9d34..c3df887 100644 --- a/libavcodec/aarch64/Makefile +++ b/libavcodec/aarch64/Makefile @@ -14,7 +14,7 @@ OBJS-$(CONFIG_VIDEODSP) += aarch64/videodsp_init.o # decoders/encoders OBJS-$(CONFIG_DCA_DECODER) += aarch64/synth_filter_init.o OBJS-$(CONFIG_RV40_DECODER) += aarch64/rv40dsp_init_aarch64.o -OBJS-$(CONFIG_VC1_DECODER) += aarch64/vc1dsp_init_aarch64.o +OBJS-$(CONFIG_VC1DSP) += aarch64/vc1dsp_init_aarch64.o OBJS-$(CONFIG_VORBIS_DECODER) += aarch64/vorbisdsp_init.o # ARMv8 optimizations diff --git a/libavcodec/aarch64/h264cmc_neon.S b/libavcodec/aarch64/h264cmc_neon.S index 486079f..ff97a29 100644 --- a/libavcodec/aarch64/h264cmc_neon.S +++ b/libavcodec/aarch64/h264cmc_neon.S @@ -445,7 +445,7 @@ endconst h264_chroma_mc4 avg, rv40 #endif -#if CONFIG_VC1_DECODER +#if CONFIG_VC1DSP h264_chroma_mc8 put, vc1 h264_chroma_mc8 avg, vc1 h264_chroma_mc4 put, vc1 diff --git a/libavcodec/arm/h264cmc_neon.S b/libavcodec/arm/h264cmc_neon.S index 77ed3c0..fc48a6f 100644 --- a/libavcodec/arm/h264cmc_neon.S +++ b/libavcodec/arm/h264cmc_neon.S @@ -455,7 +455,7 @@ endconst h264_chroma_mc4 avg, rv40 #endif -#if CONFIG_VC1_DECODER +#if CONFIG_VC1DSP h264_chroma_mc8 put, vc1 h264_chroma_mc8 avg, vc1 h264_chroma_mc4 put, vc1