diff mbox series

[FFmpeg-devel,v3,17/17] fftools/ffmpeg_filter: remove YUVJ hack

Message ID 20240830102402.18149-18-ffmpeg@haasn.xyz
State New
Headers show
Series Add avcodec_get_supported_config() | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 fail Make fate failed
andriy/make_x86 success Make finished
andriy/make_fate_x86 fail Make fate failed

Commit Message

Niklas Haas Aug. 30, 2024, 10:15 a.m. UTC 
From: Niklas Haas <git@haasn.dev>

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@khirnov.net>
---
 fftools/ffmpeg_mux_init.c | 15 ---------------
 1 file changed, 15 deletions(-)
diff mbox series

Patch

diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
index d65167bf7e..b0fe4c0f7e 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)