From patchwork Sun Sep 11 18:54:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Dekker X-Patchwork-Id: 546 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp1273999vsd; Sun, 11 Sep 2016 11:55:34 -0700 (PDT) X-Received: by 10.194.178.165 with SMTP id cz5mr11142221wjc.57.1473620134600; Sun, 11 Sep 2016 11:55:34 -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 tv2si12055809wjb.173.2016.09.11.11.55.34; Sun, 11 Sep 2016 11:55:34 -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 E0E0C689D57; Sun, 11 Sep 2016 21:55:14 +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 B7884689D3A for ; Sun, 11 Sep 2016 21:55:08 +0300 (EEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 7BF46205B4 for ; Sun, 11 Sep 2016 14:55:19 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute7.internal (MEProxy); Sun, 11 Sep 2016 14:55:19 -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=iSG34IT9a8ohH6H7Lrxp9GlOQJHt1lwyGelAgYg9C19Y8K25AcwiXlsDd/c anYxsk8GAtY0fMWe4JDMQdpULRP9udxjq/T7o47s8rYA/DKdUWtEzQej9By0fz68 SzoDNTtVP+o7UESzf/eCNdfVhB6Q7NKT1Fc2ObAooHzawbR0= 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=Oy+iTUisQWTBGv+2vTPeHcTh3njriQ4pKTH8 VTyUzH2Gvv2PZPPoQFQh8MjhiOhgVJYWfUSakglqsSNht769SxKhm1mSkRu3NRtq ao44tBZZyYSGbAzR0GCtiGG8jqmtxoeO39Ym7SLSrHrInNVqnG9KEAPJ+fp/+8/n mUp7Gws= X-Sasl-enc: MqOD7anSkP7Td9akPuGr7JD1AAolWY60+K2qDCCtNsIb 1473620119 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 0A3E4CCE8B for ; Sun, 11 Sep 2016 14:55:18 -0400 (EDT) From: Josh de Kock To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Sep 2016 19:54:57 +0100 Message-Id: <1473620098-75606-2-git-send-email-josh@itanimul.li> X-Mailer: git-send-email 2.7.4 (Apple Git-66) In-Reply-To: <1473620098-75606-1-git-send-email-josh@itanimul.li> References: <20160911183446.GF31483@kimiko.pkh.me> <1473620098-75606-1-git-send-email-josh@itanimul.li> Subject: [FFmpeg-devel] [PATCH v3 2/3] 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)