This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 47179c3452341090d39fd16c3f3d6b865025e803 Author: Andreas Rheinhardt <[email protected]> AuthorDate: Sun Dec 14 16:23:35 2025 +0100 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Sun Dec 14 21:05:54 2025 +0100 avcodec/libsvtjpegxsenc: Remove dead code The pixel format has already been checked generically. This also fixes the bug that the earlier code ignored the return value of set_pix_fmt(). Reviewed-by: James Almer <[email protected]> Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavcodec/libsvtjpegxsenc.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libavcodec/libsvtjpegxsenc.c b/libavcodec/libsvtjpegxsenc.c index dc4d238457..6b10a32d33 100644 --- a/libavcodec/libsvtjpegxsenc.c +++ b/libavcodec/libsvtjpegxsenc.c @@ -25,6 +25,7 @@ #include <SvtJpegxsEnc.h> +#include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/cpu.h" #include "libavutil/imgutils.h" @@ -113,62 +114,61 @@ static av_cold int svt_jpegxs_enc_free(AVCodecContext* avctx) { return 0; } -static int set_pix_fmt(AVCodecContext* avctx, svt_jpeg_xs_encoder_api_t *encoder) +static void set_pix_fmt(AVCodecContext *avctx, svt_jpeg_xs_encoder_api_t *encoder) { switch (avctx->pix_fmt) { case AV_PIX_FMT_YUV420P: encoder->input_bit_depth = 8; encoder->colour_format = COLOUR_FORMAT_PLANAR_YUV420; - return 0; + return; case AV_PIX_FMT_YUV422P: encoder->input_bit_depth = 8; encoder->colour_format = COLOUR_FORMAT_PLANAR_YUV422; - return 0; + return; case AV_PIX_FMT_YUV444P: encoder->input_bit_depth = 8; encoder->colour_format = COLOUR_FORMAT_PLANAR_YUV444_OR_RGB; - return 0; + return; case AV_PIX_FMT_YUV420P10LE: encoder->input_bit_depth = 10; encoder->colour_format = COLOUR_FORMAT_PLANAR_YUV420; - return 0; + return; case AV_PIX_FMT_YUV422P10LE: encoder->input_bit_depth = 10; encoder->colour_format = COLOUR_FORMAT_PLANAR_YUV422; - return 0; + return; case AV_PIX_FMT_YUV444P10LE: encoder->input_bit_depth = 10; encoder->colour_format = COLOUR_FORMAT_PLANAR_YUV444_OR_RGB; - return 0; + return; case AV_PIX_FMT_YUV420P12LE: encoder->input_bit_depth = 12; encoder->colour_format = COLOUR_FORMAT_PLANAR_YUV420; - return 0; + return; case AV_PIX_FMT_YUV422P12LE: encoder->input_bit_depth = 12; encoder->colour_format = COLOUR_FORMAT_PLANAR_YUV422; - return 0; + return; case AV_PIX_FMT_YUV444P12LE: encoder->input_bit_depth = 12; encoder->colour_format = COLOUR_FORMAT_PLANAR_YUV444_OR_RGB; - return 0; + return; case AV_PIX_FMT_YUV420P14LE: encoder->input_bit_depth = 14; encoder->colour_format = COLOUR_FORMAT_PLANAR_YUV420; - return 0; + return; case AV_PIX_FMT_YUV422P14LE: encoder->input_bit_depth = 14; encoder->colour_format = COLOUR_FORMAT_PLANAR_YUV422; - return 0; + return; case AV_PIX_FMT_YUV444P14LE: encoder->input_bit_depth = 14; encoder->colour_format = COLOUR_FORMAT_PLANAR_YUV444_OR_RGB; - return 0; + return; default: + av_unreachable("Already checked via CODEC_PIXFMTS_ARRAY"); break; } - av_log(avctx, AV_LOG_ERROR, "Unsupported pixel format.\n"); - return AVERROR_INVALIDDATA; } static av_cold int svt_jpegxs_enc_init(AVCodecContext* avctx) { _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
