diff mbox series

[FFmpeg-devel] avformat/rawenc: remove singlejpeg muxer

Message ID 20210410143036.1744-1-ffmpeg@gyani.pro
State Accepted
Commit 240aa70b798e99c15191d986261966bdbce59dba
Headers show
Series [FFmpeg-devel] avformat/rawenc: remove singlejpeg muxer
Related show

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Gyan Doshi April 10, 2021, 2:30 p.m. UTC
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(-)

Comments

Gyan Doshi April 12, 2021, 3:57 p.m. UTC | #1
Ping.

On 2021-04-10 20:00, Gyan Doshi wrote:
> 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",
Gyan Doshi April 15, 2021, 4:21 a.m. UTC | #2
On 2021-04-12 21:27, Gyan Doshi wrote:
> Ping.

Plan to push in 24h.

>
> On 2021-04-10 20:00, Gyan Doshi wrote:
>> 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",
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
Gyan Doshi April 16, 2021, 5:46 a.m. UTC | #3
On 2021-04-15 09:51, Gyan Doshi wrote:
>
>
> On 2021-04-12 21:27, Gyan Doshi wrote:
>> Ping.
>
> Plan to push in 24h.

Pushed as 240aa70b798e99c15191d986261966bdbce59dba

Regards,
Gyan

>
>>
>> On 2021-04-10 20:00, Gyan Doshi wrote:
>>> 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",
>>
>> _______________________________________________
>> ffmpeg-devel mailing list
>> ffmpeg-devel@ffmpeg.org
>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>
>> To unsubscribe, visit link above, or email
>> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff mbox series

Patch

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",