From patchwork Sat Sep 10 20:59:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Dekker X-Patchwork-Id: 538 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp922323vsd; Sat, 10 Sep 2016 13:59:32 -0700 (PDT) X-Received: by 10.28.234.16 with SMTP id i16mr3799684wmh.76.1473541172815; Sat, 10 Sep 2016 13:59:32 -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 z88si8631171wmh.144.2016.09.10.13.59.31; Sat, 10 Sep 2016 13:59:32 -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 87D97689F68; Sat, 10 Sep 2016 23:59:18 +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 164B5689EEC for ; Sat, 10 Sep 2016 23:59:12 +0300 (EEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 7AAB420267 for ; Sat, 10 Sep 2016 16:59:22 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute7.internal (MEProxy); Sat, 10 Sep 2016 16:59:22 -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=VAS6JxxIxz9nuWy01lCulADURd4 =; b=Ku07pcl4w9vK4eGW6y0V9uWzzIOmH6yVpxA1ja+NLFcgBiwIgycC8snJvf0 nFUa0tASKdzGoc14/WDCxchEga8HcH42yfKlcRvdAtgRnHukr5mWMDIzvTVaMd+y G40NovfV9HpSy/8rbltAZnICpz/0ns7Wg/f4jYR3D7zmqSrY= 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=VAS6 JxxIxz9nuWy01lCulADURd4=; b=rrwc6tQV34SYlJaBut61qM/T4m+uv6oEkmtK PbvUxPw0h6pBC+ndjVsfPa9BHBlpijLaWmGjvnqd7q96Z6x7PML/xUxv7H4m/b/m 6CZ5dz2hnI/uWDi8VfQ7Il56txmS9TjiceSjFH019wM9dpyX6rjShWuk6G9FveXv eBq5Fjo= X-Sasl-enc: IIAeoGEJCoYh4YmVrVypyRGGSGhr1qxkkHlXRsoUl09B 1473541162 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 089A3CCE8C for ; Sat, 10 Sep 2016 16:59:21 -0400 (EDT) From: Josh de Kock To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Sep 2016 21:59:13 +0100 Message-Id: <1473541154-16664-1-git-send-email-josh@itanimul.li> X-Mailer: git-send-email 2.7.4 (Apple Git-66) In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH v2 1/2] 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 FFmpeg 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 --- Changelog | 1 + doc/outdevs.texi | 2 ++ libavdevice/sdl.c | 2 ++ 3 files changed, 5 insertions(+) diff --git a/Changelog b/Changelog index 64695c8..f609a86 100644 --- a/Changelog +++ b/Changelog @@ -27,6 +27,7 @@ version : - weave filter - gblur filter - avgblur filter +- deprecated sdl outdev version 3.1: diff --git a/doc/outdevs.texi b/doc/outdevs.texi index e68653f..cfcc176 100644 --- a/doc/outdevs.texi +++ b/doc/outdevs.texi @@ -320,6 +320,8 @@ ffmpeg -i INPUT -f pulse "stream name" SDL (Simple DirectMedia Layer) output device. +This device is deprecated and will be removed in a future release. + This output device allows one to show a video stream in an SDL window. Only one SDL window is allowed per application, so you can have only one instance of this output device in an application. 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)