From f2b06b2d9462291bb6d4d5f6f80001180fd32c42 Mon Sep 17 00:00:00 2001 From: Niklas Haas Date: Mon, 8 Apr 2024 13:58:48 +0200 Subject: 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 --- 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 9dde953fc0..225b8c9467 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -998,21 +998,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) -- cgit v1.2.3