From patchwork Tue Oct 3 13:15:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wm4 X-Patchwork-Id: 5397 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.61.8 with SMTP id n8csp2710672jan; Tue, 3 Oct 2017 06:21:24 -0700 (PDT) X-Received: by 10.223.183.201 with SMTP id t9mr7519113wre.149.1507036884418; Tue, 03 Oct 2017 06:21:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507036884; cv=none; d=google.com; s=arc-20160816; b=exPJBPHIt7Aj+VOBH5ZmiaIZTGPU4ISlDvzF0GqU9eiyg/xA0ExTqORDXrsOzSdWjF XG+R2tYN4eljnc/XYqvHPbJOdZaTjzjzWFfOPDEI2XASLByG2Ghe9ZlFxCrAc3aoUyN6 kHbwxJHyvACj9jmDTdKQDzhEfhFBWX1K+RXcfjp66OlYY3j2I0g0k0ZmQDwnA0BCmmwL GFQfi7mNoor0o4FXW+yT5yA0nPFd4pgilAtpmEU6AsNxsvCqiXXeiHQAGhi1Y/2Di2yh kgba5qblomnubqIwIx6Cx5jP7VF3plKaxAeDg0q2LmeWMHN32hcTiNNi+9a/u7E+I/7w QZHA== 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=pP1xRANaZlg/PCDQu36xrwwxkSYq5kcUSuIojRO3N8A=; b=kIclbth9mkm+2wfjECroGihLj+Q6rvCwF5RZshKosGMmORNWgbF7qpUrzfyM/5+wg+ uGmdKAJnKJRkFhlv9wlq7kHugJfgIrkGIixv3HzKCnSlK8h0t7FiKPFnXnpGlvlJXrns mTiMfUHCEz9xQnbXJjWczyvKLo/hUJbOtTrJvvyEQwQVLZG9Y9J9kdIhStYhE73eynhR n/6rwCAVQeJs3T3ILoPVfBARZ/XHkIvJ45QjeUz9nwWDMB+5mLO5cdfn40Dcvt85DLBW gYoSeRUkDcik00baXeVLxXcviNyBsFh34PmwdWA7z6AlOnGmMkLDW3IdBdxBtdr0nJoM Zi5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=KWY2Psry; 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 sp=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2si9650665wma.28.2017.10.03.06.21.23; Tue, 03 Oct 2017 06:21:24 -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 header.s=20161025 header.b=KWY2Psry; 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 sp=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 816AA689FC0; Tue, 3 Oct 2017 16:21:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F283D689EFF for ; Tue, 3 Oct 2017 16:21:01 +0300 (EEST) Received: by mail-lf0-f68.google.com with SMTP id b127so9662364lfe.9 for ; Tue, 03 Oct 2017 06:21:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=2mjSruPcTLkN6vmbksTrYia92+zzrG/lffcoPKHPrEc=; b=KWY2PsryC6/hnlIg6hW91poemwf7FTZ4l/kiM748fp0XYJkYgK5s0K92xL/aXIMX5g DCFkz3AKMKxOn7gshD5yiYxKvCj+ygRidXsOFiUjU1EhLgVIpcqwyqRAI+pJii2+9enr K12b4M4wfFVLQpEd5ptR8pGRr8mCIf66doW/raQjpptgW6pScKDi1M0J177SirpGjz3o DQb7sT0M9Plia/LwpPIWRfYyxQ7vkfK4t8Xlsvvk5NcIPUxe7nWwHLUyL74EsyivDvGw RURmrfctT4ICxcSLkOg/FRUKkXrzOiSoQqpAec6yGAs81fYDpckd+TEMTxWQ5HsbervY ku7Q== 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=2mjSruPcTLkN6vmbksTrYia92+zzrG/lffcoPKHPrEc=; b=dg7mvG2rz/vkLhJY0kQpJFzIhnRhfHuEsFHSege//eGEm+iR6UFrSmbJw0u/aKOdlk mMy/mHae5nMN2VXPX+FRy2aOCdsfsxijUImGhrqiTnvySU4ynJqVP4/Mt3PuXNfRuorQ 6RX2ohtOgL40DQozPuA9N0IyPEuwG3s387E7NPflUfWSurdpaOv5UAKyX9InxlRkN19O 899Eiv7I/TJERKHmGWqATY0L6EACV4dUrWPzFWaoNWiXYdLGWRStG/u4s6IP5sEdZKZp A1xTuUmFXgvGdJX8OUZLova1IfrGko8agBKQra+3HR19AEPG0wDSVfsR6aqdNhW22eML 25Ug== X-Gm-Message-State: AHPjjUiuv+y/dKc1DSD1gkjzywMzYMSLFUS6EW+vLN9eERpBUxJ81WRc 9EZkmitWkVRzirxA1593/nfZHw== X-Google-Smtp-Source: AOwi7QAmY07xPj9rbG8aYQjcGefOPhOQK8cEiWgpm6KXMvvHBQYSH7gKdtVQtMEujksNTsNaaPZL/Q== X-Received: by 10.25.217.203 with SMTP id s72mr4567766lfi.68.1507036501899; Tue, 03 Oct 2017 06:15:01 -0700 (PDT) Received: from debian.speedport.ip (p2003006CCD5CDB6820D8428BCA02F6C5.dip0.t-ipconnect.de. [2003:6c:cd5c:db68:20d8:428b:ca02:f6c5]) by smtp.googlemail.com with ESMTPSA id 6sm2892024lju.45.2017.10.03.06.15.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Oct 2017 06:15:01 -0700 (PDT) From: wm4 To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Oct 2017 15:15:16 +0200 Message-Id: <20171003131518.4557-6-nfxjfg@googlemail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171003131518.4557-1-nfxjfg@googlemail.com> References: <20171003131518.4557-1-nfxjfg@googlemail.com> Subject: [FFmpeg-devel] [PATCH 5/7] avcodec/cuvid: rename cuvid.c to cuviddec.c 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" cuvid.c is used by Libav's CUVID hwaccel. Resolve the conflict and avoid future merge problems by renaming our decoder. --- libavcodec/Makefile | 10 +++++----- libavcodec/{cuvid.c => cuviddec.c} | 0 2 files changed, 5 insertions(+), 5 deletions(-) rename libavcodec/{cuvid.c => cuviddec.c} (100%) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index c4ec09b1c4..fa3ab8f08a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -331,7 +331,7 @@ OBJS-$(CONFIG_H264_DECODER) += h264dec.o h264_cabac.o h264_cavlc.o \ h264_mb.o h264_picture.o \ h264_refs.o h264_sei.o \ h264_slice.o h264data.o -OBJS-$(CONFIG_H264_CUVID_DECODER) += cuvid.o +OBJS-$(CONFIG_H264_CUVID_DECODER) += cuviddec.o OBJS-$(CONFIG_H264_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_H264_MMAL_DECODER) += mmaldec.o OBJS-$(CONFIG_H264_NVENC_ENCODER) += nvenc_h264.o @@ -351,7 +351,7 @@ OBJS-$(CONFIG_HAP_ENCODER) += hapenc.o hap.o OBJS-$(CONFIG_HEVC_DECODER) += hevcdec.o hevc_mvs.o \ hevc_cabac.o hevc_refs.o hevcpred.o \ hevcdsp.o hevc_filter.o hevc_data.o -OBJS-$(CONFIG_HEVC_CUVID_DECODER) += cuvid.o +OBJS-$(CONFIG_HEVC_CUVID_DECODER) += cuviddec.o OBJS-$(CONFIG_HEVC_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_HEVC_NVENC_ENCODER) += nvenc_hevc.o OBJS-$(CONFIG_NVENC_HEVC_ENCODER) += nvenc_hevc.o @@ -616,7 +616,7 @@ OBJS-$(CONFIG_VC1_DECODER) += vc1dec.o vc1_block.o vc1_loopfilter.o vc1_mc.o vc1_pred.o vc1.o vc1data.o \ msmpeg4dec.o msmpeg4.o msmpeg4data.o \ wmv2dsp.o wmv2data.o -OBJS-$(CONFIG_VC1_CUVID_DECODER) += cuvid.o +OBJS-$(CONFIG_VC1_CUVID_DECODER) += cuviddec.o OBJS-$(CONFIG_VC1_MMAL_DECODER) += mmaldec.o OBJS-$(CONFIG_VC1_QSV_DECODER) += qsvdec_other.o OBJS-$(CONFIG_VC1_V4L2M2M_DECODER) += v4l2_m2m_dec.o @@ -635,7 +635,7 @@ OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o \ vp6dsp.o vp56rac.o OBJS-$(CONFIG_VP7_DECODER) += vp8.o vp56rac.o OBJS-$(CONFIG_VP8_DECODER) += vp8.o vp56rac.o -OBJS-$(CONFIG_VP8_CUVID_DECODER) += cuvid.o +OBJS-$(CONFIG_VP8_CUVID_DECODER) += cuviddec.o OBJS-$(CONFIG_VP8_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_VP8_QSV_DECODER) += qsvdec_other.o OBJS-$(CONFIG_VP8_RKMPP_DECODER) += rkmppdec.o @@ -645,7 +645,7 @@ OBJS-$(CONFIG_VP8_V4L2M2M_ENCODER) += v4l2_m2m_enc.o OBJS-$(CONFIG_VP9_DECODER) += vp9.o vp9data.o vp9dsp.o vp9lpf.o vp9recon.o \ vp9block.o vp9prob.o vp9mvs.o vp56rac.o \ vp9dsp_8bpp.o vp9dsp_10bpp.o vp9dsp_12bpp.o -OBJS-$(CONFIG_VP9_CUVID_DECODER) += cuvid.o +OBJS-$(CONFIG_VP9_CUVID_DECODER) += cuviddec.o OBJS-$(CONFIG_VP9_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_VP9_RKMPP_DECODER) += rkmppdec.o OBJS-$(CONFIG_VP9_VAAPI_ENCODER) += vaapi_encode_vp9.o diff --git a/libavcodec/cuvid.c b/libavcodec/cuviddec.c similarity index 100% rename from libavcodec/cuvid.c rename to libavcodec/cuviddec.c