This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit c50e5c777873f13d9fabf93bb5aebe6a93ed8f6e Author: Kacper Michajłow <[email protected]> AuthorDate: Tue Dec 9 08:09:25 2025 +0100 Commit: Kacper Michajłow <[email protected]> CommitDate: Mon Dec 22 07:05:58 2025 +0100 avcodec/libaomenc: remove enum type from codecctl_* functions aom_codec_control() takes control id as int. It could be AV1E_ or common AV1_ enum in encoder, and AV1D_ for decoder. While upstream provides AOM_CODEC_CONTROL_TYPECHECKED() macro to check the provided enum value, we wrap those calls in codecctl_ functions, which makes it not feasible to use. To avoid complicating this needlessly, just use int. Fixes: warning: implicit conversion from enumeration type 'enum aom_com_control_id' to different enumeration type 'enum aome_enc_control_id' Signed-off-by: Kacper Michajłow <[email protected]> --- libavcodec/libaomenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 34253af7b8..20e97e5d43 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -303,7 +303,7 @@ static av_cold void free_frame_list(struct FrameListData *list) } static av_cold int codecctl_int(AVCodecContext *avctx, - enum aome_enc_control_id id, + int id, int val) { AOMContext *ctx = avctx->priv_data; @@ -376,7 +376,7 @@ static int add_hdr_plus(AVCodecContext *avctx, struct aom_image *img, const AVFr defined(AOM_CTRL_AV1E_GET_SEQ_LEVEL_IDX) && \ defined(AOM_CTRL_AV1E_GET_TARGET_SEQ_LEVEL_IDX) static av_cold int codecctl_intp(AVCodecContext *avctx, - enum aome_enc_control_id id, + int id, int* ptr) { AOMContext *ctx = avctx->priv_data; @@ -400,7 +400,7 @@ static av_cold int codecctl_intp(AVCodecContext *avctx, #endif static av_cold int codecctl_imgp(AVCodecContext *avctx, - enum aome_enc_control_id id, + int id, struct aom_image *img) { AOMContext *ctx = avctx->priv_data; _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
