[FFmpeg-cvslog] fftools/ffmpeg_filter: remove YUVJ hack

Niklas Haas git at videolan.org
Sun Sep 8 15:04:14 EEST 2024


ffmpeg | branch: master | Niklas Haas <git at haasn.dev> | Mon Apr  8 13:58:48 2024 +0200| [8517ff2082af041ced19739e0c0793179fb57c85] | committer: Niklas Haas

fftools/ffmpeg_filter: remove YUVJ hack

This is no longer needed, since we now correctly negotiate the required
range from the mjpeg encoder via avcodec_get_supported_config().

Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8517ff2082af041ced19739e0c0793179fb57c85
---

 fftools/ffmpeg_mux_init.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
index 452889233d..274bc61689 100644
--- a/fftools/ffmpeg_mux_init.c
+++ b/fftools/ffmpeg_mux_init.c
@@ -997,21 +997,6 @@ ost_bind_filter(const Muxer *mux, MuxStream *ms, OutputFilter *ofilter,
             return ret;
     }
 
-    // MJPEG encoder exports a full list of supported pixel formats,
-    // but the full-range ones are experimental-only.
-    // Restrict the auto-conversion list unless -strict experimental
-    // has been specified.
-    if (!strcmp(enc_ctx->codec->name, "mjpeg")) {
-        // FIXME: YUV420P etc. are actually supported with full color range,
-        // yet the latter information isn't available here.
-        static const enum AVPixelFormat mjpeg_formats[] =
-            { AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P,
-              AV_PIX_FMT_NONE };
-
-        if (enc_ctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL)
-            opts.formats = mjpeg_formats;
-    }
-
     if (threads_manual) {
         ret = av_opt_get(enc_ctx, "threads", 0, (uint8_t**)&opts.nb_threads);
         if (ret < 0)



More information about the ffmpeg-cvslog mailing list