From patchwork Wed Sep 14 22:27:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Dekker X-Patchwork-Id: 577 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp2891471vsd; Wed, 14 Sep 2016 15:28:11 -0700 (PDT) X-Received: by 10.28.127.209 with SMTP id a200mr5675681wmd.99.1473892090977; Wed, 14 Sep 2016 15:28:10 -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 jy6si501326wjc.166.2016.09.14.15.28.09; Wed, 14 Sep 2016 15:28:10 -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=@itanimul.li; dkim=neutral (body hash did not verify) header.i=@messagingengine.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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A3915689FBD; Thu, 15 Sep 2016 01:27:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B70E6897C0 for ; Thu, 15 Sep 2016 01:27:33 +0300 (EEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 7777C217C9 for ; Wed, 14 Sep 2016 18:27:45 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute7.internal (MEProxy); Wed, 14 Sep 2016 18:27:45 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=itanimul.li; h= date:from:in-reply-to:message-id:references:subject:to :x-sasl-enc:x-sasl-enc; s=mesmtp; bh=ImAwlgA4xN5bDpMvsxCYUEKUsRc =; b=bwKEpNz82lENstLPMhtA9kuiR0XyjdHf6H7hichHdLsdlQtgP8LC8RBcmhH 3EqPRpDzTd5rn6BRvLSAAWmSTYO3pN44+gxdJrZyQ+k3u6Txl/Zxq7ugGyoMyepY sM7bu8+OVPdso6ZhCl6420iyLp5PAOya2/mLm2/A8PC0f8JA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=date:from:in-reply-to:message-id :references:subject:to:x-sasl-enc:x-sasl-enc; s=smtpout; bh=ImAw lgA4xN5bDpMvsxCYUEKUsRc=; b=izRcVSuwqa35XFVJ64S0/jgAopLA0rVR/pd2 C9xLokE7KwEH6n0XH+TdZMMfort4VbCHtwKIZ7AHFVyhXk6MjzAlbUJvg0Y1TgLO +Z5+ZpHfeKsdhnqyAOcQSSYgPkf8WCrejA7lm+6WPB9Qef57wGdiLBR4xbwYdTe0 QOJUdi8= X-Sasl-enc: 7enQnzh5xEwm+ICuhMXzqYmEa5ru35IEE+fKHAjQANDL 1473892065 Received: from localhost (cpc75394-sotn16-2-0-cust168.15-1.cable.virginm.net [82.22.8.169]) by mail.messagingengine.com (Postfix) with ESMTPA id 076FEF2988 for ; Wed, 14 Sep 2016 18:27:44 -0400 (EDT) From: Josh de Kock To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Sep 2016 23:27:31 +0100 Message-Id: <1473892053-52792-3-git-send-email-josh@itanimul.li> X-Mailer: git-send-email 2.7.4 (Apple Git-66) In-Reply-To: <1473892053-52792-1-git-send-email-josh@itanimul.li> References: <1473892053-52792-1-git-send-email-josh@itanimul.li> Subject: [FFmpeg-devel] [PATCH 2/4] ffplay: make copy for SDL1 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" Signed-off-by: Josh de Kock --- Makefile | 1 + ffplay.c | 5 +++++ ffplay.c => ffplay_sdl1.c | 0 3 files changed, 6 insertions(+) copy ffplay.c => ffplay_sdl1.c (100%) diff --git a/ffplay.c b/ffplay_sdl1.c similarity index 100% copy from ffplay.c copy to ffplay_sdl1.c diff --git a/Makefile b/Makefile index 8aa72fd..15ba3df 100644 --- a/Makefile +++ b/Makefile @@ -29,6 +29,7 @@ ALLAVPROGS_G = $(AVBASENAMES:%=%$(PROGSSUF)_g$(EXESUF)) $(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog) += cmdutils.o)) $(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog)-$(CONFIG_OPENCL) += cmdutils_opencl.o)) +OBJS-ffplay-$(HAVE_SDL) += ffplay_sdl1.o OBJS-ffmpeg += ffmpeg_opt.o ffmpeg_filter.o OBJS-ffmpeg-$(CONFIG_VIDEOTOOLBOX) += ffmpeg_videotoolbox.o OBJS-ffmpeg-$(CONFIG_LIBMFX) += ffmpeg_qsv.o diff --git a/ffplay.c b/ffplay.c index adbe9cb..67a17e0 100644 --- a/ffplay.c +++ b/ffplay.c @@ -24,6 +24,9 @@ */ #include "config.h" + +#if HAVE_SDL2 + #include #include #include @@ -3863,3 +3866,5 @@ int main(int argc, char **argv) return 0; } + +#endif