This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 80ea2d14872b991109fe5539dd4c8c0822f28e87 Author: Andreas Rheinhardt <[email protected]> AuthorDate: Sun Jun 7 09:15:46 2026 +0200 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Sun Jun 7 17:53:44 2026 +0200 avcodec/liboapvenc: Return directly when possible Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavcodec/liboapvenc.c | 78 +++++++++++++++---------------------------------- 1 file changed, 24 insertions(+), 54 deletions(-) diff --git a/libavcodec/liboapvenc.c b/libavcodec/liboapvenc.c index 371ead3938..d39dd57d24 100644 --- a/libavcodec/liboapvenc.c +++ b/libavcodec/liboapvenc.c @@ -96,95 +96,65 @@ static int apv_imgb_getref(oapv_imgb_t * imgb) */ static inline int get_color_format(enum AVPixelFormat pix_fmt) { - int cf = OAPV_CF_UNKNOWN; - switch (pix_fmt) { + default: + av_unreachable("Already checked via CODEC_PIXFMTS"); case AV_PIX_FMT_GRAY10: - cf = OAPV_CF_YCBCR400; - break; + return OAPV_CF_YCBCR400; case AV_PIX_FMT_YUV422P10: - cf = OAPV_CF_YCBCR422; - break; + return OAPV_CF_YCBCR422; case AV_PIX_FMT_YUV422P12: - cf = OAPV_CF_YCBCR422; - break; + return OAPV_CF_YCBCR422; case AV_PIX_FMT_YUV444P10: - cf = OAPV_CF_YCBCR444; - break; + return OAPV_CF_YCBCR444; case AV_PIX_FMT_YUV444P12: - cf = OAPV_CF_YCBCR444; - break; + return OAPV_CF_YCBCR444; case AV_PIX_FMT_YUVA444P10: - cf = OAPV_CF_YCBCR4444; - break; + return OAPV_CF_YCBCR4444; case AV_PIX_FMT_YUVA444P12: - cf = OAPV_CF_YCBCR4444; - break; - default: - av_unreachable("Already checked via CODEC_PIXFMTS"); + return OAPV_CF_YCBCR4444; } - - return cf; } static inline int get_chroma_format_idc(enum AVPixelFormat pix_fmt) { - int cfi = -1; - switch (pix_fmt) { + default: + av_unreachable("Already checked via CODEC_PIXFMTS"); case AV_PIX_FMT_GRAY10: - cfi = APV_CHROMA_FORMAT_400; - break; + return APV_CHROMA_FORMAT_400; case AV_PIX_FMT_YUV422P10: case AV_PIX_FMT_YUV422P12: - cfi = APV_CHROMA_FORMAT_422; - break; + return APV_CHROMA_FORMAT_422; case AV_PIX_FMT_YUV444P10: case AV_PIX_FMT_YUV444P12: - cfi = APV_CHROMA_FORMAT_444; - break; + return APV_CHROMA_FORMAT_444; case AV_PIX_FMT_YUVA444P10: case AV_PIX_FMT_YUVA444P12: - cfi = APV_CHROMA_FORMAT_4444; - break; - default: - av_unreachable("Already checked via CODEC_PIXFMTS"); + return APV_CHROMA_FORMAT_4444; } - - return cfi; } static inline int get_min_profile(enum AVPixelFormat pix_fmt) { - int profile = AV_PROFILE_UNKNOWN; - switch (pix_fmt) { + default: + av_unreachable("Already checked via CODEC_PIXFMTS"); case AV_PIX_FMT_GRAY10: - profile = AV_PROFILE_APV_400_10; - break; + return AV_PROFILE_APV_400_10; case AV_PIX_FMT_YUV422P10: - profile = AV_PROFILE_APV_422_10; - break; + return AV_PROFILE_APV_422_10; case AV_PIX_FMT_YUV422P12: - profile = AV_PROFILE_APV_422_12; - break; + return AV_PROFILE_APV_422_12; case AV_PIX_FMT_YUV444P10: - profile = AV_PROFILE_APV_444_10; - break; + return AV_PROFILE_APV_444_10; case AV_PIX_FMT_YUV444P12: - profile = AV_PROFILE_APV_444_12; - break; + return AV_PROFILE_APV_444_12; case AV_PIX_FMT_YUVA444P10: - profile = AV_PROFILE_APV_4444_10; - break; + return AV_PROFILE_APV_4444_10; case AV_PIX_FMT_YUVA444P12: - profile = AV_PROFILE_APV_4444_12; - break; - default: - av_unreachable("Already checked via CODEC_PIXFMTS"); + return AV_PROFILE_APV_4444_12; } - - return profile; } static int profile_is_compatible(enum AVPixelFormat pix_fmt, int profile) _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
