avformat/rawenc: remove singlejpeg muxer

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.

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 0f340f74a0cc21999565c314bb8ee3467ed0f5e0..bc1ddfa81c98447c820d2a5c0639a2e3fe3d279d 100644 (file)
--- 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 a38fd1f58394f74f153c88bd5496c5568f52fe57..fa093c7ac290c156274248601e039ad4b66c2aef 100644 (file)
--- 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 0802d9a831274565f696891d902ed7ec65f6e2d1..9e2354554310de8d5a38e3b41c075849ac415d18 100644 (file)
--- 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",