From patchwork Sat Apr 10 14:30:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan Doshi X-Patchwork-Id: 26837 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 2EE75449C5F for ; Sat, 10 Apr 2021 17:31:03 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 084AC687F1F; Sat, 10 Apr 2021 17:31:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [80.241.56.152]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 21AA76802F5 for ; Sat, 10 Apr 2021 17:30:57 +0300 (EEST) Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4FHcqh58HkzQjmQ for ; Sat, 10 Apr 2021 16:30:56 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id o04cVaynOxge for ; Sat, 10 Apr 2021 16:30:53 +0200 (CEST) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Apr 2021 20:00:36 +0530 Message-Id: <20210410143036.1744-1-ffmpeg@gyani.pro> MIME-Version: 1.0 X-MBO-SPAM-Probability: *** X-Rspamd-Score: 3.23 / 15.00 / 15.00 X-Rspamd-Queue-Id: B60141886 X-Rspamd-UID: b56561 Subject: [FFmpeg-devel] [PATCH] avformat/rawenc: remove singlejpeg muxer 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It was added in 51ac1f616f due to ticket #4218, in order to show a single image via ffserver. With ffserver long gone, it serves no purpose. --- libavformat/Makefile | 1 - libavformat/allformats.c | 1 - libavformat/rawenc.c | 13 ------------- 3 files changed, 15 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 0f340f74a0..bc1ddfa81c 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -506,7 +506,6 @@ OBJS-$(CONFIG_SGA_DEMUXER) += sga.o OBJS-$(CONFIG_SHORTEN_DEMUXER) += shortendec.o rawdec.o OBJS-$(CONFIG_SIFF_DEMUXER) += siff.o OBJS-$(CONFIG_SIMBIOSIS_IMX_DEMUXER) += imx.o -OBJS-$(CONFIG_SINGLEJPEG_MUXER) += rawenc.o OBJS-$(CONFIG_SLN_DEMUXER) += pcmdec.o pcm.o OBJS-$(CONFIG_SMACKER_DEMUXER) += smacker.o OBJS-$(CONFIG_SMJPEG_DEMUXER) += smjpegdec.o smjpeg.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index a38fd1f583..fa093c7ac2 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -405,7 +405,6 @@ extern AVInputFormat ff_sga_demuxer; extern AVInputFormat ff_shorten_demuxer; extern AVInputFormat ff_siff_demuxer; extern AVInputFormat ff_simbiosis_imx_demuxer; -extern AVOutputFormat ff_singlejpeg_muxer; extern AVInputFormat ff_sln_demuxer; extern AVInputFormat ff_smacker_demuxer; extern AVInputFormat ff_smjpeg_demuxer; diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index caec297f4a..a43a7a6278 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -399,19 +399,6 @@ AVOutputFormat ff_mjpeg_muxer = { }; #endif -#if CONFIG_SINGLEJPEG_MUXER -AVOutputFormat ff_singlejpeg_muxer = { - .name = "singlejpeg", - .long_name = NULL_IF_CONFIG_SMALL("JPEG single image"), - .mime_type = "image/jpeg", - .audio_codec = AV_CODEC_ID_NONE, - .video_codec = AV_CODEC_ID_MJPEG, - .init = force_one_stream, - .write_packet = ff_raw_write_packet, - .flags = AVFMT_NOTIMESTAMPS, -}; -#endif - #if CONFIG_MLP_MUXER AVOutputFormat ff_mlp_muxer = { .name = "mlp",