From patchwork Mon May 14 21:58:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 8966 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp633717jad; Mon, 14 May 2018 15:07:19 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpMKgY05P2DRsDpb3o96nMduOmjxldNBi4YEovrc+TWXxyqxTrZ1ZV+mEQE998tMQiBvk1i X-Received: by 2002:a1c:ca:: with SMTP id 193-v6mr5729398wma.99.1526335639246; Mon, 14 May 2018 15:07:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526335639; cv=none; d=google.com; s=arc-20160816; b=MNpnxIeTDMkeP3hjoORXlU9SypXGWpNkFagrsJ0Fsj90w7N/WI7/TJyvkF5e2i7rbZ TOFd4p4sO4Uq0DwaXlJuI/Z7emQZjMekLyWbczwla68R4kzocK/x++K9DgCxrM9XrJak NYUyBEzhn6Z3+JYz8AAJd/XLZ6N6fr67MXrmPUiVWL7JZKCXfeOjVELdztV5ZVVsNYLQ K+KdO+tOOd9g09cCEW/OOwgzNA9I5us+PImBC2NVAktj16HoL9g2tHRfsFs/cTqdEx1z DUqH3+Mk4Ash8EBG/a6qtfky3YJZ0f+/vBALCUjXLk6u1Pi/NHQDnp3JqSa7wpymGT8h tGSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=AQoXroF38o5Kfa8DG3DqezSXbzw9mp33biulY/nSt0o=; b=uIcEJlFB/2vu9VmWyaFhgdSVd7AhXnLbnw90BbvZ7NzBJcmMRp1oTyG61sZvV1FpB6 8HK3bamga+4WunCaTy2a4UZRDO7B7l3Yk2do3vza1R+Ej7tDVQmQmXIhWERVS77V1msS tqSAd/5XMBLovQ4OPEXxBk8QQ/Q7q4GXPV4qnmmEvGoHUvGl+2k/8DYfeEH6N7U2T9Uc 2uq8ZOz7djHgx5NwFkCxlV3fxOVG1Mn4Ccq+PjNAAy5sRvMoIpCYs/RTe0rKXwZnkUgf OnlFZetIUo68BtWe2Z0seVu5wGrzUGCMGgPm5sq0fZkADThb6LH/BCStdpo72nFHKNgY aOTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=ML3yPH8M; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h189-v6si5874248wmd.132.2018.05.14.15.07.18; Mon, 14 May 2018 15:07:19 -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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=ML3yPH8M; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D2CBF689E18; Tue, 15 May 2018 01:06:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f52.google.com (mail-wm0-f52.google.com [74.125.82.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DCCE6689B9D for ; Tue, 15 May 2018 01:06:33 +0300 (EEST) Received: by mail-wm0-f52.google.com with SMTP id o78-v6so17931271wmg.0 for ; Mon, 14 May 2018 15:07:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=RLwW7CbA1W1nsoRMuF+0rEyP//6l4dPg0e3Ziu8WGD8=; b=ML3yPH8MdGtldKh7YJpAGmyLSH7ezE6Zxh1R29G3ewGv8bQC511eS7hVW1WHgIe96s gOovA9CZ/He1zs9dnkkfhYC2FuqzQWYO9GK9tI3ji/SAMqoJCZPcDvwqwUp/D4Xw0IGI 6jBCkA76WLJ/avZbYuyxLnQhPePMCDXGDVKxAXZidLRqNeOkN8Fn6gAW4czzLD9nCi+V TQPXgBriiYkG6F+2xaJ6PIWtOB1E4rdePJokew6HQaFxpWTdjRJ5i616YbR7xsvJfEhs Wb/a8pwtQAuU8WIMsSCv7npSlPlT+67JkGwNt7x91QPA4sSVNnSQpapd5oDeskgzRKg2 YwTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=RLwW7CbA1W1nsoRMuF+0rEyP//6l4dPg0e3Ziu8WGD8=; b=chvB8m6hH3+bntHvEY84sersA0WvSyWukr7PnSNWaD1G8ea1c3YBr46eiJTbggUUEp Gse1eclnKL4XV9fOJ0P2fMxTrjPhnwe1cqSKmrm9YbfzFJI1Po9C99EojyPED8Sgix6R tXu/SBdfNelzTAlRw64ffG2e7/a1v0OF2EgqseWWqfngGEmlJcmnSrYzDrco1RdUK7l2 t1ibpW6JwGNC66wlLdE7ERHKrEC6Xpjz0JRYeT+/vaZcuCj3We+iVmiqwTC9NX8f8bhA lXY03arWzEHUGDnJ37qVFNnTOwoD84lzEfa/mxXuZ54RxbqNxrAU9jhiMgqf2VKG5X1J Z9vQ== X-Gm-Message-State: ALKqPweYlPQCrHDG5dYJzlJ1ufXVZ180amx5hWC1cD1HMIVNPVVPOurc PmVqQg+dxM7SU20LMujFuBvKoZLr X-Received: by 2002:a1c:459a:: with SMTP id l26-v6mr6858206wmi.95.1526335144234; Mon, 14 May 2018 14:59:04 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id 123-v6sm10348180wmt.19.2018.05.14.14.59.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 May 2018 14:59:03 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Mon, 14 May 2018 22:58:57 +0100 Message-Id: <20180514215858.11461-2-sw@jkqxz.net> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180514215858.11461-1-sw@jkqxz.net> References: <20180514215858.11461-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 2/3] lavu/Makefile: Fix alignment and ordering 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavutil/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavutil/Makefile b/libavutil/Makefile index a63ba523c9..4fe470748c 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -160,14 +160,14 @@ OBJS = adler32.o \ OBJS-$(CONFIG_CUDA) += hwcontext_cuda.o OBJS-$(CONFIG_D3D11VA) += hwcontext_d3d11va.o OBJS-$(CONFIG_DXVA2) += hwcontext_dxva2.o -OBJS-$(CONFIG_QSV) += hwcontext_qsv.o OBJS-$(CONFIG_LIBDRM) += hwcontext_drm.o OBJS-$(CONFIG_LZO) += lzo.o +OBJS-$(CONFIG_MEDIACODEC) += hwcontext_mediacodec.o OBJS-$(CONFIG_OPENCL) += hwcontext_opencl.o +OBJS-$(CONFIG_QSV) += hwcontext_qsv.o OBJS-$(CONFIG_VAAPI) += hwcontext_vaapi.o OBJS-$(CONFIG_VIDEOTOOLBOX) += hwcontext_videotoolbox.o OBJS-$(CONFIG_VDPAU) += hwcontext_vdpau.o -OBJS-$(CONFIG_MEDIACODEC) += hwcontext_mediacodec.o OBJS += $(COMPAT_OBJS:%=../compat/%) @@ -178,7 +178,7 @@ SKIPHEADERS-$(HAVE_CUDA_H) += hwcontext_cuda.h SKIPHEADERS-$(CONFIG_CUDA) += hwcontext_cuda_internal.h SKIPHEADERS-$(CONFIG_D3D11VA) += hwcontext_d3d11va.h SKIPHEADERS-$(CONFIG_DXVA2) += hwcontext_dxva2.h -SKIPHEADERS-$(CONFIG_QSV) += hwcontext_qsv.h +SKIPHEADERS-$(CONFIG_QSV) += hwcontext_qsv.h SKIPHEADERS-$(CONFIG_OPENCL) += hwcontext_opencl.h SKIPHEADERS-$(CONFIG_VAAPI) += hwcontext_vaapi.h SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += hwcontext_videotoolbox.h