From patchwork Sun Sep 11 18:54:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Dekker X-Patchwork-Id: 545 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp1274032vsd; Sun, 11 Sep 2016 11:55:42 -0700 (PDT) X-Received: by 10.194.61.243 with SMTP id t19mr13717677wjr.60.1473620142110; Sun, 11 Sep 2016 11:55: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 p7si10750111wju.161.2016.09.11.11.55.41; Sun, 11 Sep 2016 11:55: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 48400689D69; Sun, 11 Sep 2016 21:55:17 +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 32336689CC2 for ; Sun, 11 Sep 2016 21:55:10 +0300 (EEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id EBBAD205B9 for ; Sun, 11 Sep 2016 14:55:20 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute7.internal (MEProxy); Sun, 11 Sep 2016 14:55:20 -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=g2Uyf83wOhpdGjSlFCUDSH4eR+M =; b=eFjn97Na2Cu3X6SAsJwZQxJbxDBnG9DneU0JE9T9D8rCLSry7Obdu/2yEKK 4DY9dxmm5ml/zOCMputmkis5b/uQXuREjgRDEQo2Hs0sO6I2cGKS3lEofZYAB5cT oyWAnbQOo/DLFN2dDmsTTWC9FIbL72B0BUq/qwhipuzcVXak= 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=g2Uy f83wOhpdGjSlFCUDSH4eR+M=; b=scd4asiBEZVidK+ZBlvksyENvxHDseKaZk8k HGtV4fY7eD+kvoLSHff3BusgxjPTZhYxZ9BBbQsXN+/FAOc5EbAoujO58yxbXe4l 7RQsVWYagtBGBPsymv4MCeadn78bZN8eTR9rD3mTKjs8/ETeSV0H9ZqGG7USzkX7 30KTbzk= X-Sasl-enc: HncyS9TlaUrklWYf/JG7EvG4tpH8NVOf3GYDVsg2pnIr 1473620120 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 7D6EBCCE8C for ; Sun, 11 Sep 2016 14:55:20 -0400 (EDT) From: Josh de Kock To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Sep 2016 19:54:58 +0100 Message-Id: <1473620098-75606-3-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 3/3] lavd: deprecate opengl outdev 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 device depends on SDL which is deprecated. Signed-off-by: Josh de Kock --- Changelog | 2 +- doc/outdevs.texi | 2 ++ libavdevice/opengl_enc.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index f609a86..6c9f766 100644 --- a/Changelog +++ b/Changelog @@ -27,7 +27,7 @@ version : - weave filter - gblur filter - avgblur filter -- deprecated sdl outdev +- deprecated sdl and opengl outdev version 3.1: diff --git a/doc/outdevs.texi b/doc/outdevs.texi index cfcc176..34afa6f 100644 --- a/doc/outdevs.texi +++ b/doc/outdevs.texi @@ -214,6 +214,8 @@ See also @url{http://linux-fbdev.sourceforge.net/}, and fbset(1). @section opengl OpenGL output device. +This device is deprecated and will be removed in a future release. + To enable this output device you need to configure FFmpeg with @code{--enable-opengl}. This output device allows one to render to OpenGL context. diff --git a/libavdevice/opengl_enc.c b/libavdevice/opengl_enc.c index 1dbbb80..d611830 100644 --- a/libavdevice/opengl_enc.c +++ b/libavdevice/opengl_enc.c @@ -1064,6 +1064,8 @@ static av_cold int opengl_write_header(AVFormatContext *h) AVStream *st; int ret; + av_log(h, AV_LOG_WARNING, "The opengl output device is deprecated.\n"); + if (h->nb_streams != 1 || h->streams[0]->codecpar->codec_type != AVMEDIA_TYPE_VIDEO || h->streams[0]->codecpar->codec_id != AV_CODEC_ID_RAWVIDEO) {