From patchwork Sun Sep 25 06:20:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaolei Yu X-Patchwork-Id: 710 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp1339875vsd; Sat, 24 Sep 2016 23:28:15 -0700 (PDT) X-Received: by 10.194.61.72 with SMTP id n8mr12814106wjr.74.1474784895343; Sat, 24 Sep 2016 23:28:15 -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 k124si3404912wmg.2.2016.09.24.23.28.14; Sat, 24 Sep 2016 23:28:15 -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 5BB4C689CCB; Sun, 25 Sep 2016 09:27:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f174.google.com (mail-qt0-f174.google.com [209.85.216.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 71664689B35 for ; Sun, 25 Sep 2016 09:27:48 +0300 (EEST) Received: by mail-qt0-f174.google.com with SMTP id 38so69109710qte.1 for ; Sat, 24 Sep 2016 23:28:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:subject:to:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=krdeaM1E8GQam+PVly5AVBO17uMyPx3jd3WUfJOdj1M=; b=xizu8iRpneKmbZ1GZJjt83UD9lIJirY7uH35dwT/gWY4mGdsWzH3yhj24ds9HTadU+ VE06y0etUvE+D1K8dRAX38ZAdaAspjBOuBJIeyTqkSirJc6noP+fWTqtB888OXF8wiL/ YjiChDk9/6A8Qpu6/eGqcrnPmt5y7d+NiHYtPwX9a/hMdb2/4gAX2h56z1oUhicqvz92 QMf/fuad0FcgymXLGzwx7Fpf75n2iahXE2tFwEpmDWMpI1ignR7FcICvVEAWSs5O3ZR+ Vh86h8xqeRzzDrDSXEVeQ91ojokGxv8J2IzAVBAdCveMUNDpDhuaJZ64dkhpxPGZX/9O mOIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=krdeaM1E8GQam+PVly5AVBO17uMyPx3jd3WUfJOdj1M=; b=jwB+oEYvyhPPdbUYwT1j6apsQ1+lrFYPRKPQ0eOMT1jCaJNeA7Oj540AB1TiObkTBK 0ze3PiUxy/EReBtiRfp7xV6cAUVvr10+5p2XnzgapRBFa8Fdc8Envl/nYHJfLA3NDYcx SfjmW5ekgM8L/JqZzrY9XdwFJmiY+zL0a1+q87FldLVq0KhmCcfZhgPqcITRGFaDpyiR JzxsbrhhyrNhUuw+vEfIkas1btRpUDS2vF50k52t5S2CnwmAnxAZucsnJDV8YLZ3Rb90 XmzDAHBo5rLkGGb2A3Ky4lFYdLvDZXjjkiybpHiwTVmv4qp56Zk3ljBQS08uAk6rn393 tKeg== X-Gm-Message-State: AA6/9Rm+txgdbi8sQ8eM5M8xeuhrxCnRALIwnVpQFKqwRE1jA6z7+7LArcsx+pdsdXxX5g== X-Received: by 10.237.54.164 with SMTP id f33mr15195007qtb.139.1474784429661; Sat, 24 Sep 2016 23:20:29 -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 c44sm8365701qta.49.2016.09.24.23.20.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 Sep 2016 23:20:29 -0700 (PDT) From: Xiaolei Yu To: FFmpeg development discussions and patches Message-ID: <7783620b-5a1f-5179-3526-73143553bccd@gmail.com> Date: Sun, 25 Sep 2016 14:20:23 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.2.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] 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