From patchwork Fri Sep 9 23:00:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 498 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp551903vsd; Fri, 9 Sep 2016 16:14:34 -0700 (PDT) X-Received: by 10.194.83.33 with SMTP id n1mr4808156wjy.36.1473462873230; Fri, 09 Sep 2016 16:14:33 -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 gg5si4972267wjb.115.2016.09.09.16.14.28; Fri, 09 Sep 2016 16:14:33 -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 C4437689D4E; Sat, 10 Sep 2016 02:14:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi0-f65.google.com (mail-oi0-f65.google.com [209.85.218.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0FBF5689CE4 for ; Sat, 10 Sep 2016 02:14:10 +0300 (EEST) Received: by mail-oi0-f65.google.com with SMTP id a144so4374376oii.1 for ; Fri, 09 Sep 2016 16:14:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=sJ+sU7Dwg+9gUFa71raq31nmcMD80mT2mkaGs6ziBOw=; b=GbqubmXf9G5Cmq74LfnkiRGXVq6VH94CL1CHbCNhdO6Lv0aokzEwQuxpG4froyaEk/ uuTz5SdJUpI72k6Bt4zwXbkspfsS5X6XkmGNeWIdi46OCn+EgrImwexMtf3iuJaz/5ll XW4oLPbo20mS99hglmcoY/o+sUNvvZWCX8OqKllrp8obQXXLHTr2fMpE4cNODR1Q3/BC wzhUqhGKkEsVI0bGOEVpqSEGbVpeOj44xr5Cj1RfAjNgy3fNQpgGtaAS9pqWv0aStGov 7FPsaXGAeb/7p0612dA8R84cCzelAdIBS/7/FlPJFC3hAbmf4Nc6bxjiDdCj2fJ+O1KK OMxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=sJ+sU7Dwg+9gUFa71raq31nmcMD80mT2mkaGs6ziBOw=; b=LTNCDRd+tqd0Iy4PZ1VJa9Z3WfYqnr3ErLDJKMNfVEbwRMmug8IFTO3CCYRfjIlUJM VEZFRa2ANoLqRTRwMfsym9e8tm+lILCaJIpFqbNSchepOu6xaxihkoargJc0aLXTUZlz L7hlnQ+ow6CRjtnoaSVMggkXCzqVeK1wzKe2JcJ15jT3XnvyV4slPNJI0urkuLNtYwWF Eba8cFuffy9wCu1wvUalF/cVEx9IeIkuMK14QkhL6Y4LDs/hwPCgUhPb77Np4uz/8+qQ h8igvmzjCRvnSZ8tMijIdQIix5iJhK3iqdSiFwfq/mHp4DW1tQ0HvUBEwHuO2b9FkltR di8g== X-Gm-Message-State: AE9vXwMvKG9OWsYlPSDzaLq1MNPSmZ1Dgl408VZhsSFPhyn0rnA66/NWDpY3oGq9umdMJg== X-Received: by 10.157.17.9 with SMTP id g9mr8987824ote.42.1473462027561; Fri, 09 Sep 2016 16:00:27 -0700 (PDT) Received: from Rodgers-MacBook-Pro.local.net (c-73-209-137-129.hsd1.il.comcast.net. [73.209.137.129]) by smtp.gmail.com with ESMTPSA id v69sm2814434itc.1.2016.09.09.16.00.26 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 09 Sep 2016 16:00:27 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Sep 2016 18:00:07 -0500 Message-Id: <20160909230007.49352-3-rodger.combs@gmail.com> X-Mailer: git-send-email 2.10.0 In-Reply-To: <20160909230007.49352-1-rodger.combs@gmail.com> References: <20160909230007.49352-1-rodger.combs@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/3] lavc/wmv2dec: add #if around AVCodec def 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" --- libavcodec/wmv2dec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index 20dbee5..477196e 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -455,6 +455,7 @@ int ff_wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64]) return 0; } +#if CONFIG_WMV2_DECODER static av_cold int wmv2_decode_init(AVCodecContext *avctx) { Wmv2Context *const w = avctx->priv_data; @@ -495,3 +496,4 @@ AVCodec ff_wmv2_decoder = { .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, }; +#endif