From patchwork Sat Sep 10 19:53:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Dekker X-Patchwork-Id: 534 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp905815vsd; Sat, 10 Sep 2016 12:54:42 -0700 (PDT) X-Received: by 10.28.164.130 with SMTP id n124mr1537004wme.105.1473537282309; Sat, 10 Sep 2016 12:54:42 -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 w1si8515718wje.194.2016.09.10.12.54.41; Sat, 10 Sep 2016 12:54:42 -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 63582689F3B; Sat, 10 Sep 2016 22:54:28 +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 75648689EC5 for ; Sat, 10 Sep 2016 22:54:22 +0300 (EEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id DAB1E2038F for ; Sat, 10 Sep 2016 15:54:31 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute7.internal (MEProxy); Sat, 10 Sep 2016 15:54:31 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=itanimul.li; h= date:from:message-id:subject:to:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=SLL5v+fxaDgiLr0ZjqeoxQX+ccE=; b=MtDlmeey12CbNhM7oixMYAmEL4zA eUIJWau8EWg3+qGhhps1XjNxMph386gWxM/F8Q+C/Sx0xy+OmRQDfBVo8qcsmESo Az35aKPNDLLpYvjLlMz0x3TrNA674t8YcvFXwhxOpCETdnaneZGZamIv5qMjY2xK 8GVVV57HRCX+af8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=date:from:message-id:subject:to :x-sasl-enc:x-sasl-enc; s=smtpout; bh=SLL5v+fxaDgiLr0ZjqeoxQX+cc E=; b=r3zNHJtJgQDSBVGhkAOv9vfdQAfnlLJ7xGldpJJK0zjWYWdi+0Ek+Ft34o KZ/nPNediIxvoEK1tHPMKMb+Tb96YLyONgAzl5pLHPOO7MpeGvGQAhNkuRCACXj0 vB5r6KckC9ONwkZoZlKzAUtPzAYdzm0/M9Tlrc7XmYATg8L6k= X-Sasl-enc: L0/v0HvBIlthxOKnsKofjpY0qHhnvVYecG/lhuF+UVIr 1473537271 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 6AEDAF29CF for ; Sat, 10 Sep 2016 15:54:31 -0400 (EDT) From: Josh de Kock To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Sep 2016 20:53:21 +0100 Message-Id: <1473537201-14503-1-git-send-email-josh@itanimul.li> X-Mailer: git-send-email 2.7.4 (Apple Git-66) Subject: [FFmpeg-devel] [PATCH] lavd: deprecate SDL device 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" SDL1 has been unmaintained for quite a while (version 1.2.15 was released 4 years ago). Due to how SDL2 works (it requires the main thread), there won't be able to be a replacement to the SDL avdevice if ffplay were to switch to SDL2 in the future. This commit would also help in getting ffplay to switch to SDL2 as there'd no longer be a dependency on the SDL avdevice. Signed-off-by: Josh de Kock --- configure | 3 +++ libavdevice/sdl.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/configure b/configure index b11ca7f..48cce34 100755 --- a/configure +++ b/configure @@ -5850,6 +5850,9 @@ if enabled gcrypt; then fi fi +if ! enabled sdl; then + disable sdl_outdev +fi if ! disabled sdl; then SDL_CONFIG="${cross_prefix}sdl-config" if check_pkg_config sdl SDL_events.h SDL_PollEvent; then diff --git a/libavdevice/sdl.c b/libavdevice/sdl.c index 4322750..06ef35c 100644 --- a/libavdevice/sdl.c +++ b/libavdevice/sdl.c @@ -237,6 +237,8 @@ static int sdl_write_header(AVFormatContext *s) AVCodecParameters *par = st->codecpar; int i, ret; + av_log(s, AV_LOG_WARNING, "The SDL output device is deprecated.\n"); + if (!sdl->window_title) sdl->window_title = av_strdup(s->filename); if (!sdl->icon_title)