From patchwork Sun Sep 25 13:29:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Dekker X-Patchwork-Id: 716 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp1459162vsd; Sun, 25 Sep 2016 06:30:06 -0700 (PDT) X-Received: by 10.28.127.209 with SMTP id a200mr9623383wmd.99.1474810205961; Sun, 25 Sep 2016 06:30:05 -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 ia7si15442213wjb.123.2016.09.25.06.30.05; Sun, 25 Sep 2016 06:30:05 -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 B1072689E27; Sun, 25 Sep 2016 16:29:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 40878689A60 for ; Sun, 25 Sep 2016 16:29:39 +0300 (EEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 501ED204BC for ; Sun, 25 Sep 2016 09:29:55 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute7.internal (MEProxy); Sun, 25 Sep 2016 09:29:55 -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=B6pIkdGoo7CxT27CZIjK4dMCkqw =; b=jV/4/NZcCoOSThyFBV4zAMO+U1WZMAfXBcrusLMVL7ubwPLvylty4ZL5Khj 02L9XSdgkI2mgVw/e7xQL7S9LzpMtNkDG2xUef+1VHpMUC6Gi2KDUCjUTbPQc6h5 UMQmtKZ1xU6zyOzteHwXIxdKMOXj6YxJD3cBOmNDn70YWcCc= 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=B6pI kdGoo7CxT27CZIjK4dMCkqw=; b=e+duufNv5SGGPFtkaqtNo6u+hDKsLd5/pW/1 BBFzuXG/ZbUmkZlrzXvJgeOTKN/JQZ8oHf2FQiVYl1nNPDMSaX2Rqk7S1zju60Ph O/pNzipjgO/GoqM4j33HspO0FeNNyQxg8pF0O/Ir+kPnaHXnRT7GTtHcKewX4kNs AexKhjc= X-Sasl-enc: GqMP3ItiDuQQyRTPjr3Ch88VU8EQTC8gkuQHvShCPhi4 1474810194 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 D390FF2985 for ; Sun, 25 Sep 2016 09:29:54 -0400 (EDT) From: Josh de Kock To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Sep 2016 14:29:50 +0100 Message-Id: <20160925132950.10673-1-josh@itanimul.li> X-Mailer: git-send-email 2.8.4 (Apple Git-73) In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH v3] lavd/sdl2: add sdl alias 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" This commit also adds an sdl alias for the configure script. Signed-off-by: Josh de Kock --- configure | 2 ++ libavdevice/sdl2.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure b/configure index f593191..899057d 100755 --- a/configure +++ b/configure @@ -1547,6 +1547,7 @@ EXTERNAL_LIBRARY_LIST=" opengl openssl schannel + sdl sdl2 securetransport videotoolbox @@ -5846,6 +5847,7 @@ if enabled gcrypt; then fi fi +disabled sdl && disable sdl2 if ! disabled sdl2; then SDL2_CONFIG="${cross_prefix}sdl2-config" if check_pkg_config sdl2 SDL_events.h SDL_PollEvent; then diff --git a/libavdevice/sdl2.c b/libavdevice/sdl2.c index 217ccc0..5d9e91e 100644 --- a/libavdevice/sdl2.c +++ b/libavdevice/sdl2.c @@ -352,7 +352,7 @@ static const AVClass sdl2_class = { }; AVOutputFormat ff_sdl2_muxer = { - .name = "sdl2", + .name = "sdl,sdl2", .long_name = NULL_IF_CONFIG_SMALL("SDL2 output device"), .priv_data_size = sizeof(SDLContext), .audio_codec = AV_CODEC_ID_NONE,